diff --git a/src/router/index.js b/src/router/index.js
index eb6fd1229f64214e48db1dd6e4b92b58c5b23219..c4ee12753ed2539fc33bfe99e9c5275ce316cc4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,7 +9,10 @@ const routes = [
   },
   {
     path: '/MainPage',
-    component: () => import('../views/MainPage')
+    component: () => import('../views/MainPage'),
+    meta: {
+      requireAuth: true // 该路由项需要权限校验
+    }
   },
   {
     path: '/',
@@ -18,26 +21,44 @@ const routes = [
   {
     path: '/home',
     component: () => import('../views/Home'),
+    meta: {
+      requireAuth: true // 该路由项需要权限校验
+    },
     children: [
       {
         path: '/reportExport',
-        component: () => import('../views/DataManagement/ReportExport')
+        component: () => import('../views/DataManagement/ReportExport'),
+        meta: {
+          requireAuth: true // 该路由项需要权限校验
+        }
       },
       {
         path: '/roleManage',
-        component: () => import('../views/SystemSetting/RoleManagement')
+        component: () => import('../views/SystemSetting/RoleManagement'),
+        meta: {
+          requireAuth: true // 该路由项需要权限校验
+        }
       },
       {
         path: '/userManage',
-        component: () => import('../views/SystemSetting/UserManagement')
+        component: () => import('../views/SystemSetting/UserManagement'),
+        meta: {
+          requireAuth: true // 该路由项需要权限校验
+        }
       },
       {
         path: '/deviceList',
-        component: () => import('../views/FacilityManagement/FacilityLists')
+        component: () => import('../views/FacilityManagement/FacilityLists'),
+        meta: {
+          requireAuth: true // 该路由项需要权限校验
+        }
       },
       {
         path: '/operationLogs',
-        component: () => import('../views/FacilityManagement/OperationLogs')
+        component: () => import('../views/FacilityManagement/OperationLogs'),
+        meta: {
+          requireAuth: true // 该路由项需要权限校验
+        }
       }
     ]
   }
@@ -49,10 +70,9 @@ const router = new VueRouter({
 })
 
 // 路由守卫
-/*
 router.beforeEach((to, from, next) => {
   if (to.meta.requireAuth) { // 判断该路由是否需要登录权限
-    if (localStorage.token) { // 获取当前的token是否存在
+    if (sessionStorage.token) { // 获取当前的token是否存在
       // console.log('token存在')
       next()
     } else {
@@ -66,6 +86,5 @@ router.beforeEach((to, from, next) => {
     next()
   }
 })
-*/
 
 export default router
diff --git a/src/views/DataManagement/ReportExport.vue b/src/views/DataManagement/ReportExport.vue
index 5b0ee27e1a6625337704794ef9b129d837e7c3da..a951d896a57ec98e6a51f9c234e432c34b52aefb 100644
--- a/src/views/DataManagement/ReportExport.vue
+++ b/src/views/DataManagement/ReportExport.vue
@@ -16,6 +16,8 @@
             <el-date-picker
               v-model="searchFrom.startTime"
               type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
               placeholder="开始时间"
             />
           </el-form-item>
@@ -23,13 +25,15 @@
             <el-date-picker
               v-model="searchFrom.endTime"
               type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
               placeholder="结束时间"
             />
           </el-form-item>
           <el-form-item>
             <el-input
-              v-model="searchFrom.searchData"
-              placeholder="请输入设备编号/设备名"
+              v-model="searchFrom.deviceId"
+              placeholder="请输入设备编号"
               @input="inputClear"
               @keyup.enter.native="getData"
             />
@@ -66,13 +70,10 @@
             <el-table-column prop="pDir1Direction" align="center" label="P1D1R1方向报警计数" width="140" />
             <el-table-column prop="pDir2Direction" align="center" label="P2D1R2方向报警计数" width="140" />
             <el-table-column prop="operationHours" align="center" label="总运行时间计数" width="120" />
-            <el-table-column prop="electromagneticId" align="center" label="电磁噪音Id" width="120" />
             <el-table-column prop="electromagneticInformation" align="center" label="电磁噪音信息" width="120" />
-            <el-table-column prop="noiseId" align="center" label="噪音Id" width="120" />
             <el-table-column prop="noiseInformation" align="center" label="噪音信息" width="120" />
             <el-table-column prop="call1Id" align="center" label="call1光电感应" width="120" />
             <el-table-column prop="call2Id" align="center" label="call2光电感应" width="120" />
-            <el-table-column prop="createTime" align="center" label="创建时间" width="120" />
           </el-table>
         </div>
         <!-- 数据表格模块 -->
@@ -120,7 +121,7 @@ export default {
         title: '导出报表'
       },
       searchFrom: {
-        searchData: '',
+        deviceId: '',
         startTime: '',
         endTime: ''
       },
@@ -238,7 +239,7 @@ export default {
         }
         const res = await getReportData(query)
         if (res.code === 200) {
-          this.pager.pageSize = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10
+          this.pager.totalPage = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10
           this.tableData = res.data.result.tableData
         }
       } catch (err) {
@@ -272,7 +273,11 @@ export default {
         const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
         const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
         try {
-          const res = await downloadExcel([1])
+          const Array = []
+          this.multipleSelection.forEach(i => {
+            Array.push(i.id)
+          })
+          const res = await downloadExcel(Array)
           const time = year + '-' + month + '-' + day
           fileDownload(res, `${time}.xlsx`)
         } catch (err) {
@@ -293,7 +298,7 @@ export default {
     .el-table__body-wrapper::-webkit-scrollbar {
       /*width: 0;宽度为0隐藏*/
       width: 4px;
-      height: 15px;
+      height: 10px;
     }
 
     .el-table__body-wrapper::-webkit-scrollbar-thumb {
diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/FacilityManagement/OperationLogs.vue
index a5eb7099946a957f715da7becf3aa1073f50ee9c..b4ab20b85966df2619658fd55eb8994f4adf369d 100644
--- a/src/views/FacilityManagement/OperationLogs.vue
+++ b/src/views/FacilityManagement/OperationLogs.vue
@@ -16,6 +16,8 @@
             <el-date-picker
               v-model="searchFrom.startTime"
               type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
               placeholder="开始时间"
             />
           </el-form-item>
@@ -23,6 +25,8 @@
             <el-date-picker
               v-model="searchFrom.endTime"
               type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
               placeholder="结束时间"
             />
           </el-form-item>