diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index b616910..359b514 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index b616910..359b514 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index be5ad57..e168b83 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -7,7 +7,7 @@
           <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
         </el-form-item>
         <el-form-item>
-          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+          <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" class="selectForm-container-item" placeholder="单位/部门" />
         </el-form-item>
         <!--<el-form-item class="selectForm-container-item">-->
         <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
@@ -47,19 +47,28 @@
         </el-form-item>
         <!--</el-row>-->
         <!--<el-row>-->
-        <el-form-item>
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.beginTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择开始时间"/>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.endTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择结束时间"/>-->
+        <!--</el-form-item>-->
+        <el-form-item prop="startTime">
           <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择开始时间"/>
-        </el-form-item>
-        <el-form-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择结束时间"/>
+            start-placeholder="选择开始时间"
+            end-placeholder="选择结束时间"/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <!--</el-row>-->
@@ -130,6 +139,7 @@
         isAbnormal: '',
         deviceType: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -201,7 +211,19 @@
       filename: 'device_template.xlsx',
       deptShowTop: false, // 权属单位下拉是否显示顶级
       deptShow: true,
-      deviceTypeList: []
+      deviceTypeList: [],
+
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
     }
   },
   mounted() {

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index b616910..359b514 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index be5ad57..e168b83 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -7,7 +7,7 @@
           <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
         </el-form-item>
         <el-form-item>
-          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+          <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" class="selectForm-container-item" placeholder="单位/部门" />
         </el-form-item>
         <!--<el-form-item class="selectForm-container-item">-->
         <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
@@ -47,19 +47,28 @@
         </el-form-item>
         <!--</el-row>-->
         <!--<el-row>-->
-        <el-form-item>
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.beginTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择开始时间"/>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.endTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择结束时间"/>-->
+        <!--</el-form-item>-->
+        <el-form-item prop="startTime">
           <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择开始时间"/>
-        </el-form-item>
-        <el-form-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择结束时间"/>
+            start-placeholder="选择开始时间"
+            end-placeholder="选择结束时间"/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <!--</el-row>-->
@@ -130,6 +139,7 @@
         isAbnormal: '',
         deviceType: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -201,7 +211,19 @@
       filename: 'device_template.xlsx',
       deptShowTop: false, // 权属单位下拉是否显示顶级
       deptShow: true,
-      deviceTypeList: []
+      deviceTypeList: [],
+
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
     }
   },
   mounted() {
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 033712f..976579e 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -7,40 +7,49 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
+            <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" placeholder="单位/部门" />
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">
               <el-option
-              v-for="item in doorList"
-              :key="item.id"
-              :label="item.doorName"
-               :value="item.doorCode"/>
+                v-for="item in doorList"
+                :key="item.id"
+                :label="item.doorName"
+                :value="item.doorCode"/>
             </el-select>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in temperatureState"-->
-                <!--:key="'temp_'+item.value"-->
-                <!--:label="item.name"-->
-                <!--:value="item.value"-->
-              <!--/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in temperatureState"-->
+          <!--:key="'temp_'+item.value"-->
+          <!--:label="item.name"-->
+          <!--:value="item.value"-->
+          <!--/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.beginTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择开始时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.endTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择结束时间"/>-->
+          <!--</el-form-item>-->
+          <el-form-item prop="startTime">
             <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
+              start-placeholder="选择开始时间"
+              end-placeholder="选择结束时间"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -112,6 +121,7 @@
         personDeptId: '',
         isAbnormal: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -185,6 +195,17 @@
       deptShow: true
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index b616910..359b514 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index be5ad57..e168b83 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -7,7 +7,7 @@
           <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
         </el-form-item>
         <el-form-item>
-          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+          <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" class="selectForm-container-item" placeholder="单位/部门" />
         </el-form-item>
         <!--<el-form-item class="selectForm-container-item">-->
         <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
@@ -47,19 +47,28 @@
         </el-form-item>
         <!--</el-row>-->
         <!--<el-row>-->
-        <el-form-item>
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.beginTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择开始时间"/>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.endTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择结束时间"/>-->
+        <!--</el-form-item>-->
+        <el-form-item prop="startTime">
           <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择开始时间"/>
-        </el-form-item>
-        <el-form-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择结束时间"/>
+            start-placeholder="选择开始时间"
+            end-placeholder="选择结束时间"/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <!--</el-row>-->
@@ -130,6 +139,7 @@
         isAbnormal: '',
         deviceType: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -201,7 +211,19 @@
       filename: 'device_template.xlsx',
       deptShowTop: false, // 权属单位下拉是否显示顶级
       deptShow: true,
-      deviceTypeList: []
+      deviceTypeList: [],
+
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
     }
   },
   mounted() {
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 033712f..976579e 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -7,40 +7,49 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
+            <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" placeholder="单位/部门" />
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">
               <el-option
-              v-for="item in doorList"
-              :key="item.id"
-              :label="item.doorName"
-               :value="item.doorCode"/>
+                v-for="item in doorList"
+                :key="item.id"
+                :label="item.doorName"
+                :value="item.doorCode"/>
             </el-select>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in temperatureState"-->
-                <!--:key="'temp_'+item.value"-->
-                <!--:label="item.name"-->
-                <!--:value="item.value"-->
-              <!--/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in temperatureState"-->
+          <!--:key="'temp_'+item.value"-->
+          <!--:label="item.name"-->
+          <!--:value="item.value"-->
+          <!--/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.beginTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择开始时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.endTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择结束时间"/>-->
+          <!--</el-form-item>-->
+          <el-form-item prop="startTime">
             <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
+              start-placeholder="选择开始时间"
+              end-placeholder="选择结束时间"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -112,6 +121,7 @@
         personDeptId: '',
         isAbnormal: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -185,6 +195,17 @@
       deptShow: true
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index d452eb0..1219602 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -25,19 +25,28 @@
           <!--/>-->
           <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
+          <!--<el-form-item>-->
+            <!--<el-date-picker-->
+              <!--v-model="listQuery.beginTime"-->
+              <!--type="datetime"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--placeholder="选择开始时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+            <!--<el-date-picker-->
+              <!--v-model="listQuery.endTime"-->
+              <!--type="datetime"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--placeholder="选择结束时间"/>-->
+          <!--</el-form-item>-->
+          <el-form-item prop="startTime">
             <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
+              start-placeholder="选择开始时间"
+              end-placeholder="选择结束时间"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -103,6 +112,7 @@
         keyword: '',
         personDeptId: ''
       },
+      timeRange: [],
       devQuery: {
         devType: '1'
       },
@@ -172,6 +182,17 @@
       deptShow: true
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()

diff --git a/src/api/person.js b/src/api/person.js
index 24460ea..e20a8fd 100644
--- a/src/api/person.js
+++ b/src/api/person.js
@@ -18,7 +18,7 @@
 // 查询员工列表
 export function getPersonListAll(params) {
   return request({
-    url: '/person/list',
+    url: '/person/irisList',
     method: 'get',
     params
   })
@@ -94,6 +94,7 @@
   return request({
     url: 'person/batchIrisDelete',
     method: 'post',
+    timeout: 60000,
     params: {
       ids: ids
     },
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..9f2ce9b 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -28,6 +28,11 @@
           loading.close() // 关闭加载动画
           console.log('download===', res)
           const blob = new Blob([res.data])
+          if ('msSaveOrOpenBlob' in navigator) {
+            // console.log('msSaveOrOpenBlob')
+            window.navigator.msSaveOrOpenBlob(blob, filename)
+            return
+          }
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index bb81dc5..4078704 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -1,10 +1,10 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增员工授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -162,6 +162,7 @@
     },
     // 取消
     cancel: function() {
+      console.log('cancel')
       this.dialogFormVisible = false
       this.$emit('watchChild')
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 5cab2bf..c367959 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增访客授权" append-to-body @close="cancel">
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 4c01fbf..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptId" :need-top="deptShowTop" placeholder="选择单位/部门"/>
+            <dept-select v-model="listQuery.deptId" :need-top="true" :dept-show="true" placeholder="选择单位/部门"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -184,6 +184,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无员工授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部员工授权吗？',
         '确认操作',
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 477fa0d..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -175,6 +175,10 @@
     },
     // 取消全部授权
     cancelAllPermission() {
+      if(this.total <= 0){
+        this.$message.error('当前门禁无访客授权')
+        return
+      }
       this.$confirm(
         '确认取消该门禁上的全部访客授权吗？',
         '确认操作',
diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue
index b256978..2105a85 100644
--- a/src/views/accessStrategy/editStrategy.vue
+++ b/src/views/accessStrategy/editStrategy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form v-loading="loading" ref="dataForm" :rules="rules" :model="strategyForm" label-well-code="right" label-width="100px">
       <!--策略名称-->
       <el-row type="flex" justify="center">
@@ -37,7 +37,7 @@
               v-model.trim="strategyForm.beginDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择生效时间"/>
           </el-form-item>
         </el-col>
@@ -49,7 +49,7 @@
               v-model.trim="strategyForm.endDatetime"
               :disabled="isReadMode"
               type="datetime"
-              value-format="yyyy-MM-dd hh:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择失效时间"/>
           </el-form-item>
         </el-col>
@@ -269,6 +269,21 @@
           return false
         }
       }
+      if (strategyForm.beginTime && strategyForm.endTime) {
+        const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime
+        const tmpDate2 = '2020-01-01 ' + strategyForm.endTime
+
+        if (new Date(tmpDate1) > new Date(tmpDate2)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
+      if (strategyForm.beginDatetime && strategyForm.endDatetime) {
+        if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) {
+          this.$message.warning('生效时间不能大于失效时间')
+          return false
+        }
+      }
       return true
     },
     // 新增数据
@@ -276,9 +291,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             addStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -305,9 +321,10 @@
       if (this.validateForm(this.strategyForm)) {
         // 将星期列表转为字符串
         const strategyForm = this.strategyForm
-        strategyForm.week = strategyForm.week.join(',')
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            strategyForm.week.sort() // 将星期排序
+            strategyForm.week = strategyForm.week.join(',')
             updateStrategy(strategyForm).then(response => {
               if (response.code === 200) {
                 this.$message.success('修改成功')
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 8447d0b..e0d00e9 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue
index ba97c98..a025fed 100644
--- a/src/views/deviceManage/syncRecord.vue
+++ b/src/views/deviceManage/syncRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="同步识别记录" append-to-body @close="cancel">
     <div class="block data-pick">
       <p class="demonstration">选择同步时间范围</p>
       <el-date-picker
diff --git a/src/views/doorManage/bindDevice.vue b/src/views/doorManage/bindDevice.vue
index dcbab3e..2e430cd 100644
--- a/src/views/doorManage/bindDevice.vue
+++ b/src/views/doorManage/bindDevice.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="设备绑定" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue
index 63b45bf..6f53100 100644
--- a/src/views/doorManage/controlDoor.vue
+++ b/src/views/doorManage/controlDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" title="常开/常闭设置" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index f4af3c7..981e8f9 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
     <el-form ref="dataForm" :rules="rules" :model="doorForm" label-well-code="right" label-width="100px">
       <el-row type="flex" justify="center">
         <el-col :span="18">
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="true" :dept-show="true" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -83,6 +83,7 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        console.log('update',row)
         this.doorForm = {
           id: row.id,
           doorCode: row.doorCode, // 门禁编码
diff --git a/src/views/doorManage/listDoor.vue b/src/views/doorManage/listDoor.vue
index b092834..d5896ca 100644
--- a/src/views/doorManage/listDoor.vue
+++ b/src/views/doorManage/listDoor.vue
@@ -161,6 +161,8 @@
               this.$message.success('删除成功')
               this.fetchData()
             }
+          }).catch(() => {
+            this.fetchData()
           })
         })
       } else {
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index c9b888b..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -55,7 +55,7 @@
           <el-row v-if="personType=='1'" :gutter="20">
             <el-col :span="11">
               <el-form-item label="部门" prop="deptid">
-                <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
               </el-form-item>
             </el-col>
             <el-col :span="11" >
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 471d430..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -56,7 +56,7 @@
             <el-row v-if="personType=='1'" :gutter="20">
               <el-col :span="11">
                 <el-form-item label="部门" prop="deptid">
-                  <dept-select v-model="personForm.deptid" :need-top="false" :dept-show="true" placeholder="单位/部门"/>
+                  <dept-select v-model="personForm.deptid" :need-top="true" :dept-show="true"  placeholder="单位/部门"/>
                 </el-form-item>
               </el-col>
               <el-col :span="11" >
@@ -556,6 +556,7 @@
     // 重置表单
     resetForm() {
       const id = this.personForm.id
+      const personType = this.personType
       this.personForm = {
         idCardNo: '', // 身份证号
         name: '', // 姓名
@@ -581,6 +582,9 @@
       if (id) {
         this.personForm.id = id
       }
+      if(personType){
+        this.personForm.personType = personType
+      }
       this.photo = ''
       this.irisForm = {
         personId: '',
@@ -695,7 +699,12 @@
           this.$refs['dataForm'].clearValidate()
         })
       }).catch(() => {
-        this.$router.push({ path: '/staff' })
+        if (this.personType === '1') {
+          this.$router.push({ path: '/staff' })
+        } else {
+          this.$router.push({ path: '/visitor' })
+        }
+
       })
     },
     // 没用了
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 3b383f4..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -9,7 +9,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="false" placeholder="单位/部门"/>
+            <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
           <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
@@ -249,11 +249,16 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPerson(staffIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index b616910..359b514 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body @close="cancel">
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index be5ad57..e168b83 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -7,7 +7,7 @@
           <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" class="selectForm-container-item" clearable/>
         </el-form-item>
         <el-form-item>
-          <dept-select v-model="listQuery.personDeptId" :need-top="false" class="selectForm-container-item" placeholder="单位/部门" />
+          <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" class="selectForm-container-item" placeholder="单位/部门" />
         </el-form-item>
         <!--<el-form-item class="selectForm-container-item">-->
         <!--<el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">-->
@@ -47,19 +47,28 @@
         </el-form-item>
         <!--</el-row>-->
         <!--<el-row>-->
-        <el-form-item>
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.beginTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择开始时间"/>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item>-->
+          <!--<el-date-picker-->
+            <!--v-model="listQuery.endTime"-->
+            <!--type="datetime"-->
+            <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+            <!--placeholder="选择结束时间"/>-->
+        <!--</el-form-item>-->
+        <el-form-item prop="startTime">
           <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择开始时间"/>
-        </el-form-item>
-        <el-form-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择结束时间"/>
+            start-placeholder="选择开始时间"
+            end-placeholder="选择结束时间"/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <!--</el-row>-->
@@ -130,6 +139,7 @@
         isAbnormal: '',
         deviceType: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -201,7 +211,19 @@
       filename: 'device_template.xlsx',
       deptShowTop: false, // 权属单位下拉是否显示顶级
       deptShow: true,
-      deviceTypeList: []
+      deviceTypeList: [],
+
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
     }
   },
   mounted() {
diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue
index 033712f..976579e 100644
--- a/src/views/query/queryStaff.vue
+++ b/src/views/query/queryStaff.vue
@@ -7,40 +7,49 @@
             <el-input v-model.trim="listQuery.keyword" placeholder="姓名/身份证号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.personDeptId" :need-top="false" placeholder="单位/部门" />
+            <dept-select v-model="listQuery.personDeptId" :need-top="true" :dept-show="true" placeholder="单位/部门" />
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.doorCode" placeholder="门禁" clearable value="">
               <el-option
-              v-for="item in doorList"
-              :key="item.id"
-              :label="item.doorName"
-               :value="item.doorCode"/>
+                v-for="item in doorList"
+                :key="item.id"
+                :label="item.doorName"
+                :value="item.doorCode"/>
             </el-select>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
-              <!--<el-option-->
-                <!--v-for="item in temperatureState"-->
-                <!--:key="'temp_'+item.value"-->
-                <!--:label="item.name"-->
-                <!--:value="item.value"-->
-              <!--/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.isAbnormal" placeholder="体温状况" clearable value="">-->
+          <!--<el-option-->
+          <!--v-for="item in temperatureState"-->
+          <!--:key="'temp_'+item.value"-->
+          <!--:label="item.name"-->
+          <!--:value="item.value"-->
+          <!--/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.beginTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择开始时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+          <!--<el-date-picker-->
+          <!--v-model="listQuery.endTime"-->
+          <!--type="datetime"-->
+          <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--placeholder="选择结束时间"/>-->
+          <!--</el-form-item>-->
+          <el-form-item prop="startTime">
             <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
+              start-placeholder="选择开始时间"
+              end-placeholder="选择结束时间"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -112,6 +121,7 @@
         personDeptId: '',
         isAbnormal: ''
       }, // 筛选条件
+      timeRange: [],
       columns: [
         {
           text: '员工编号',
@@ -185,6 +195,17 @@
       deptShow: true
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()
diff --git a/src/views/query/queryVisitor.vue b/src/views/query/queryVisitor.vue
index d452eb0..1219602 100644
--- a/src/views/query/queryVisitor.vue
+++ b/src/views/query/queryVisitor.vue
@@ -25,19 +25,28 @@
           <!--/>-->
           <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item>
+          <!--<el-form-item>-->
+            <!--<el-date-picker-->
+              <!--v-model="listQuery.beginTime"-->
+              <!--type="datetime"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--placeholder="选择开始时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+            <!--<el-date-picker-->
+              <!--v-model="listQuery.endTime"-->
+              <!--type="datetime"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--placeholder="选择结束时间"/>-->
+          <!--</el-form-item>-->
+          <el-form-item prop="startTime">
             <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择开始时间"/>
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择结束时间"/>
+              start-placeholder="选择开始时间"
+              end-placeholder="选择结束时间"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -103,6 +112,7 @@
         keyword: '',
         personDeptId: ''
       },
+      timeRange: [],
       devQuery: {
         devType: '1'
       },
@@ -172,6 +182,17 @@
       deptShow: true
     }
   },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   mounted() {
     this.getDoorSource()
     this.getDeviceSource()
diff --git a/src/views/statistics/statistics.vue b/src/views/statistics/statistics.vue
index e63408c..f119d9a 100644
--- a/src/views/statistics/statistics.vue
+++ b/src/views/statistics/statistics.vue
@@ -55,12 +55,12 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item class="selectForm-container-item" label="部门:">
-                    <dept-select v-model="deptId" :need-top="false" :dept-show="true" size="small" placeholder="请选择部门" />
+                    <dept-select v-model="deptId" :need-top="true" :dept-show="true" size="small" filterable placeholder="请选择部门" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item class="selectForm-container-item" label="员工:">
-                    <el-select v-model="personId" :disabled="!allowChoose" placeholder="全部" size="small" @change="fetchPersonStatistic">
+                    <el-select v-model="personId" :disabled="!allowChoose" placeholder="全部" size="small" filterable @change="fetchPersonStatistic">
                       <el-option
                         v-for="item in personList"
                         :key="item.id"