diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index f15a502..e2e4c1e 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -90,7 +90,7 @@
     // 轨迹上墙
     onwall(item) {
       const params = {
-        type: 'onwall-' + this.listQuery.staffName,
+        type: 'onwall-' + item.staffName,
         message: this.wallList
       }
       repostSocket(params).then(response => {

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index f15a502..e2e4c1e 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -90,7 +90,7 @@
     // 轨迹上墙
     onwall(item) {
       const params = {
-        type: 'onwall-' + this.listQuery.staffName,
+        type: 'onwall-' + item.staffName,
         message: this.wallList
       }
       repostSocket(params).then(response => {
diff --git a/src/views/popup/device.vue b/src/views/popup/device.vue
index 88b742e..b64186e 100644
--- a/src/views/popup/device.vue
+++ b/src/views/popup/device.vue
@@ -204,7 +204,14 @@
     font-size: 15px;
   }
   .close{
-    position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
+    position: absolute;
+    right: 20px;
+    top:5px;
+    color:white;
+    background: #fc2323cc;
+    width: 25px;
+    height:25px;
+    border-radius: 5px;
     padding: 3px;
   }
 }

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index f15a502..e2e4c1e 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -90,7 +90,7 @@
     // 轨迹上墙
     onwall(item) {
       const params = {
-        type: 'onwall-' + this.listQuery.staffName,
+        type: 'onwall-' + item.staffName,
         message: this.wallList
       }
       repostSocket(params).then(response => {
diff --git a/src/views/popup/device.vue b/src/views/popup/device.vue
index 88b742e..b64186e 100644
--- a/src/views/popup/device.vue
+++ b/src/views/popup/device.vue
@@ -204,7 +204,14 @@
     font-size: 15px;
   }
   .close{
-    position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
+    position: absolute;
+    right: 20px;
+    top:5px;
+    color:white;
+    background: #fc2323cc;
+    width: 25px;
+    height:25px;
+    border-radius: 5px;
     padding: 3px;
   }
 }
diff --git a/src/views/popup/floor.vue b/src/views/popup/floor.vue
index da5c829..6342d5a 100644
--- a/src/views/popup/floor.vue
+++ b/src/views/popup/floor.vue
@@ -31,8 +31,9 @@
     </div>
     <div class="block">
       <div :style="{backgroundImage:'url('+titleImg+')'}" class="title">区域引导示意图</div>
-      <el-image :src="area" class="area-map-image" mode="fill"/>
+      <el-image :src="area" class="area-map-image" mode="fill" @click="isbig=true"/>
     </div>
+    <el-image class="floor-big-pic" :src="area" v-if="isbig" @click="isbig=false"/>
   </div>
 </template>
 
@@ -45,6 +46,7 @@
   components: { FloorPie },
   data() {
     return {
+      isbig: false,
       titleImg: require('@/assets/popup/title.png'), // 背景图片
       titleAll: require('@/assets/popup/title-all.png'), // 背景图片
       building: '一期主楼', // 楼名称
@@ -162,5 +164,13 @@
     position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
     padding: 3px;
   }
+  .floor-big-pic{
+    position: fixed;
+    bottom: calc( 50% - 200px);
+    left: calc( 50% - 300px);
+    height: 400px;
+    height: 600px;
+    z-index: 999999999;
+  }
 }
 </style>

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index f15a502..e2e4c1e 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -90,7 +90,7 @@
     // 轨迹上墙
     onwall(item) {
       const params = {
-        type: 'onwall-' + this.listQuery.staffName,
+        type: 'onwall-' + item.staffName,
         message: this.wallList
       }
       repostSocket(params).then(response => {
diff --git a/src/views/popup/device.vue b/src/views/popup/device.vue
index 88b742e..b64186e 100644
--- a/src/views/popup/device.vue
+++ b/src/views/popup/device.vue
@@ -204,7 +204,14 @@
     font-size: 15px;
   }
   .close{
-    position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
+    position: absolute;
+    right: 20px;
+    top:5px;
+    color:white;
+    background: #fc2323cc;
+    width: 25px;
+    height:25px;
+    border-radius: 5px;
     padding: 3px;
   }
 }
diff --git a/src/views/popup/floor.vue b/src/views/popup/floor.vue
index da5c829..6342d5a 100644
--- a/src/views/popup/floor.vue
+++ b/src/views/popup/floor.vue
@@ -31,8 +31,9 @@
     </div>
     <div class="block">
       <div :style="{backgroundImage:'url('+titleImg+')'}" class="title">区域引导示意图</div>
-      <el-image :src="area" class="area-map-image" mode="fill"/>
+      <el-image :src="area" class="area-map-image" mode="fill" @click="isbig=true"/>
     </div>
+    <el-image class="floor-big-pic" :src="area" v-if="isbig" @click="isbig=false"/>
   </div>
 </template>
 
@@ -45,6 +46,7 @@
   components: { FloorPie },
   data() {
     return {
+      isbig: false,
       titleImg: require('@/assets/popup/title.png'), // 背景图片
       titleAll: require('@/assets/popup/title-all.png'), // 背景图片
       building: '一期主楼', // 楼名称
@@ -162,5 +164,13 @@
     position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
     padding: 3px;
   }
+  .floor-big-pic{
+    position: fixed;
+    bottom: calc( 50% - 200px);
+    left: calc( 50% - 300px);
+    height: 400px;
+    height: 600px;
+    z-index: 999999999;
+  }
 }
 </style>
diff --git a/src/views/popup/right.vue b/src/views/popup/right.vue
index c55ac08..4571ea1 100644
--- a/src/views/popup/right.vue
+++ b/src/views/popup/right.vue
@@ -61,6 +61,7 @@
   components: {PersonTable },
   data() {
     return {
+      timer: null,
       titleImg: require('@/assets/popup/title.png'), // 背景图片
       titleAll: require('@/assets/popup/title-all.png'), // 背景图片
       line: require('@/assets/popup/line.png'), // 背景图片
@@ -76,8 +77,13 @@
     }
   },
   mounted() {
+    clearInterval(this.timer)
     this.initData()
   },
+  beforeDestroy() {
+    clearInterval(this.timer)
+    this.timer = null
+  },
   methods: {
     initStar() {
       var myChart = echarts.init(document.getElementById('safe-star'))
@@ -178,14 +184,16 @@
       })
     },
     initData() {
-      securityScore().then(response => {
-        if (response.code === 200) {
-          this.list['0'] = response.data['一期主楼']
-          this.list['1'] = response.data['二期主楼']
-          this.list['2'] = response.data['录制楼']
-          this.list['3'] = response.data['1600演播厅']
-        }
-      })
+      this.timer = setInterval(() => {
+        securityScore().then(response => {
+          if (response.code === 200) {
+            this.list['0'] = response.data['一期主楼']
+            this.list['1'] = response.data['二期主楼']
+            this.list['2'] = response.data['录制楼']
+            this.list['3'] = response.data['1600演播厅']
+          }
+        })
+      }, 10000)
       categoryStatistics().then(response => {
         if (response.code === 200) {
           this.safeData = response.data

diff --git a/src/api/pop.js b/src/api/pop.js
index bfc147d..01ddde7 100644
--- a/src/api/pop.js
+++ b/src/api/pop.js
@@ -127,11 +127,11 @@
 }
 
 // 单层设备在线情况
-export function deviceStatus(data) {
+export function deviceStatus(params) {
   return request({
     url: 'propertyManage/device/status',
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 03e17f1..df71207 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -69,12 +69,12 @@
         </el-col>
       </el-row>
       <!-- 表格正文-->
-      <el-table v-loading="listLoading" :data="data" :size="size" class="table" row-class-name="small-row-class" border @selection-change="selectionChange" @row-click="rowClick">
+      <el-table v-loading="listLoading" :data="data" :size="size" class="table" :row-class-name="tableRowClassName" border @selection-change="selectionChange" @row-click="rowClick">
         <!--需要加在表最前方的插槽-->
         <slot name="preColumns" />
         <el-table-column v-if="toolsOption.needCheckBox" align="center" type="selection" width="45" />
         <!--序号列-->
-        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-if="options && options.needIndex" :index="indexMethod" label="#" align="center" type="index"/>
         <!--内容列, 若columns存在且长度大于0-->
         <template v-if="columnsFiltered && columnsFiltered.length>0">
           <el-table-column
@@ -114,6 +114,15 @@
 export default {
   name: 'NormalTable',
   props: {
+    colorRow: {
+      type: Object,
+      default: function() {
+        return {
+          isColor: false,
+          param: ''
+        }
+      }
+    },
     query: {
       type: Object,
       default: function() {
@@ -206,6 +215,12 @@
     this.changeColumns()
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (this.colorRow.isColor && !row[this.colorRow.param]) {
+        return 'color-row'
+      }
+      return 'small-row-class'
+    },
     // 初始化显示列状态
     initColumnsState() {
       this.columnsChecked = []
@@ -296,6 +311,10 @@
       margin-top:10px;
     }
   }
-
 </style>
 
+<style>
+.el-table .color-row {
+  background: #ffb568;
+}
+</style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 6e0f656..7f0d668 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+<!--    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />-->
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
@@ -68,7 +68,7 @@
     }),
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        hideSidebar: false,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -77,7 +77,7 @@
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
+      // this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
   }
 }
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 604fe3d..3fbd22f 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -7,7 +7,7 @@
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('CloseSideBar', { withoutAnimation: false })
+        // store.dispatch('CloseSideBar', { withoutAnimation: false })
       }
     }
   },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 4a0b1dc..c3ab3a2 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -3,8 +3,8 @@
 import { getPublicKey, setPublicKey, getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
-    opened: !+Cookies.get('sidebarStatus'),
-    withoutAnimation: false
+    opened: true,
+    withoutAnimation: true
   },
   device: 'desktop',
   kaptcha: '', // 验证码
@@ -14,18 +14,18 @@
 }
 const mutations = {
   TOGGLE_SIDEBAR: state => {
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
+    // if (state.sidebar.opened) {
+    //   Cookies.set('sidebarStatus', 1)
+    // } else {
+    //   Cookies.set('sidebarStatus', 0)
+    // }
+    // state.sidebar.opened = !state.sidebar.opened
+    // state.sidebar.withoutAnimation = false
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 1)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
+    // Cookies.set('sidebarStatus', 1)
+    // state.sidebar.opened = false
+    // state.sidebar.withoutAnimation = withoutAnimation
   },
   TOGGLE_DEVICE: (state, device) => {
     state.device = device
diff --git a/src/views/popup/bottom.vue b/src/views/popup/bottom.vue
index 1181efe..e3fe7e2 100644
--- a/src/views/popup/bottom.vue
+++ b/src/views/popup/bottom.vue
@@ -21,15 +21,15 @@
 
 <script>
 // import VisitorPie from "@/views/popup/components/visitorPie";
-import VisitBar from "@/views/popup/components/visitBar";
-import StaffBar1 from "@/views/popup/components/staffBar1";
-import CaseTable from "@/views/popup/components/caseTable";
+import VisitBar from '@/views/popup/components/visitBar';
+import StaffBar1 from '@/views/popup/components/staffBar1';
+import CaseTable from '@/views/popup/components/caseTable';
 // import ReqairTable from "@/views/popup/components/reqairTable";
-import OtherLine from "@/views/popup/components/otherLine";
+import OtherLine from '@/views/popup/components/otherLine';
 
 export default {
   name: 'Bottom',
-  components: {OtherLine, CaseTable, StaffBar1, VisitBar },
+  components: { OtherLine, CaseTable, StaffBar1, VisitBar },
   data() {
     return {
       titleImg: require('@/assets/popup/title.png'), // 背景图片
diff --git a/src/views/popup/components/caseTable.vue b/src/views/popup/components/caseTable.vue
index 4fa6791..95aa677 100644
--- a/src/views/popup/components/caseTable.vue
+++ b/src/views/popup/components/caseTable.vue
@@ -13,7 +13,7 @@
         </div>
         <div class="table_main_body">
           <div class="table_inner_body" :style="{top: tableTop + 'px'}">
-            <div v-for="(item,index) in tableList" :class="index%2==1?'table_tr && ' + checkCell(item):'table_tr1 && ' + checkCell(item)" :key="index" @click="JumpDevice(item)">
+            <div v-for="(item,index) in tableList" class="table_tr" :class="checkCell(item,index)" :key="index" @click="JumpDevice(item)">
               <div class="tr1 tr">{{item.levelName}}</div>
               <div class="tr2 tr">{{item.description}}</div>
               <div class="tr1 tr">{{item.statusName}}</div>
@@ -33,7 +33,7 @@
 <script>
 
 import { getCaseListPage } from '@/api/case'
-import {repostSocket} from "@/api/common";
+import { repostSocket } from '@/api/common'
 
 export default {
   name: 'CaseTable',
@@ -58,7 +58,7 @@
   },
 
   // 如果没有父元素传值，将watch内的内容搬至mounted中即可
-  props: ["activeFactoryId"],
+  props: ['activeFactoryId'],
   watch: {
     activeFactoryId(val, oldVal) {
       clearInterval(this.componentTimer)
@@ -75,7 +75,7 @@
     clearInterval(this.tableTimer)
   },
   methods: {
-    checkCell(val) {
+    checkCell(val, index) {
       if (val.statusName === '未解决' || val.statusName === '解决中') {
         switch (val.levelName) {
           case '重大':
@@ -85,6 +85,8 @@
           default:
             return 'low-state'
         }
+      } else if (index % 2 === 1) {
+        return 'table_tr1'
       }
       return ''
     },
@@ -103,7 +105,7 @@
       this.isbig = false
       getCaseListPage({
         offset: 1,
-        limit: 50
+        limit: 15
       }).then(response => {
         if (response.code === 200) {
           this.tableList = response.data.rows
@@ -172,18 +174,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.hard-state{
-  color:red;
-  font-weight: bold;
-}
-.medium-state{
-  color: #ea9700;
-  font-weight: bold;
-}
-.low-state{
-  color: #646464;
-  font-weight: bold;
-}
 .flowTable {
   width: 100%;
   height: 150px;
@@ -249,31 +239,33 @@
   left: 0;
   color: #cce9ff;
 }
+
 .table_tr {
   display: flex;
-  height: 40px;
-  line-height: 40px;
   font-size: 13px;
-  background: rgba(3, 145, 167, 0.1);
   border: 1px solid rgb(71, 160, 199);
   margin-top: 2px;
+  height: 40px;
+  line-height: 40px;
   cursor: pointer;
   :hover{
     background: rgba(255, 153, 51, 0.6);
   }
 }
+.hard-state{
+  background:red;
+}
+.medium-state{
+  background: #ea9700;
+}
+.low-state{
+  background: #646464;
+}
+.table_tr0 {
+  background: rgba(3, 145, 167, 0.1);
+}
 .table_tr1 {
-  display: flex;
-  height: 44px;
-  line-height: 44px;
-  font-size: 13px;
   background: rgb(64, 87, 120);
-  border: 1px solid rgb(71, 160, 199);
-  margin-top: 2px;
-  cursor: pointer;
-  :hover{
-    background: rgba(255, 153, 51, 0.6);
-  }
 }
 .bottom-big-pic{
   position: fixed;
diff --git a/src/views/popup/components/personTable.vue b/src/views/popup/components/personTable.vue
index f15a502..e2e4c1e 100644
--- a/src/views/popup/components/personTable.vue
+++ b/src/views/popup/components/personTable.vue
@@ -90,7 +90,7 @@
     // 轨迹上墙
     onwall(item) {
       const params = {
-        type: 'onwall-' + this.listQuery.staffName,
+        type: 'onwall-' + item.staffName,
         message: this.wallList
       }
       repostSocket(params).then(response => {
diff --git a/src/views/popup/device.vue b/src/views/popup/device.vue
index 88b742e..b64186e 100644
--- a/src/views/popup/device.vue
+++ b/src/views/popup/device.vue
@@ -204,7 +204,14 @@
     font-size: 15px;
   }
   .close{
-    position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
+    position: absolute;
+    right: 20px;
+    top:5px;
+    color:white;
+    background: #fc2323cc;
+    width: 25px;
+    height:25px;
+    border-radius: 5px;
     padding: 3px;
   }
 }
diff --git a/src/views/popup/floor.vue b/src/views/popup/floor.vue
index da5c829..6342d5a 100644
--- a/src/views/popup/floor.vue
+++ b/src/views/popup/floor.vue
@@ -31,8 +31,9 @@
     </div>
     <div class="block">
       <div :style="{backgroundImage:'url('+titleImg+')'}" class="title">区域引导示意图</div>
-      <el-image :src="area" class="area-map-image" mode="fill"/>
+      <el-image :src="area" class="area-map-image" mode="fill" @click="isbig=true"/>
     </div>
+    <el-image class="floor-big-pic" :src="area" v-if="isbig" @click="isbig=false"/>
   </div>
 </template>
 
@@ -45,6 +46,7 @@
   components: { FloorPie },
   data() {
     return {
+      isbig: false,
       titleImg: require('@/assets/popup/title.png'), // 背景图片
       titleAll: require('@/assets/popup/title-all.png'), // 背景图片
       building: '一期主楼', // 楼名称
@@ -162,5 +164,13 @@
     position: absolute;right: 20px;top:5px;color:white;background: #fc2323cc;width: 25px;height:25px;border-radius: 5px;
     padding: 3px;
   }
+  .floor-big-pic{
+    position: fixed;
+    bottom: calc( 50% - 200px);
+    left: calc( 50% - 300px);
+    height: 400px;
+    height: 600px;
+    z-index: 999999999;
+  }
 }
 </style>
diff --git a/src/views/popup/right.vue b/src/views/popup/right.vue
index c55ac08..4571ea1 100644
--- a/src/views/popup/right.vue
+++ b/src/views/popup/right.vue
@@ -61,6 +61,7 @@
   components: {PersonTable },
   data() {
     return {
+      timer: null,
       titleImg: require('@/assets/popup/title.png'), // 背景图片
       titleAll: require('@/assets/popup/title-all.png'), // 背景图片
       line: require('@/assets/popup/line.png'), // 背景图片
@@ -76,8 +77,13 @@
     }
   },
   mounted() {
+    clearInterval(this.timer)
     this.initData()
   },
+  beforeDestroy() {
+    clearInterval(this.timer)
+    this.timer = null
+  },
   methods: {
     initStar() {
       var myChart = echarts.init(document.getElementById('safe-star'))
@@ -178,14 +184,16 @@
       })
     },
     initData() {
-      securityScore().then(response => {
-        if (response.code === 200) {
-          this.list['0'] = response.data['一期主楼']
-          this.list['1'] = response.data['二期主楼']
-          this.list['2'] = response.data['录制楼']
-          this.list['3'] = response.data['1600演播厅']
-        }
-      })
+      this.timer = setInterval(() => {
+        securityScore().then(response => {
+          if (response.code === 200) {
+            this.list['0'] = response.data['一期主楼']
+            this.list['1'] = response.data['二期主楼']
+            this.list['2'] = response.data['录制楼']
+            this.list['3'] = response.data['1600演播厅']
+          }
+        })
+      }, 10000)
       categoryStatistics().then(response => {
         if (response.code === 200) {
           this.safeData = response.data
diff --git a/src/views/visitor/visitList.vue b/src/views/visitor/visitList.vue
index 7a18fb6..90d19e2 100644
--- a/src/views/visitor/visitList.vue
+++ b/src/views/visitor/visitList.vue
@@ -37,7 +37,7 @@
         />
       </search-item>
     </search-area>
-    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :color-row="colorRow" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
       <template slot="columns">
         <el-table-column label="访客照片" align="center" width="120">
           <template slot-scope="scope">
@@ -139,6 +139,10 @@
       areaList: [],
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
+      colorRow: {
+        isColor: true,
+        param: 'checkPass'
+      },
       tableOption: {
         head: {
           show: true, // 是否需要标题栏，
@@ -212,23 +216,6 @@
           this.listLoading = false
         }
       })
-      // const that = this
-      // setTimeout(function() {
-      //   that.list = [
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' },
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' },
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' },
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' },
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' },
-      //     { id: '', name: '李思思', IDcard: '220100000000004124', phone: '13268643243', inTime: '2022-05-06 19:12:00', outTime: '2022-05-06 19:36:00', enterWay: '身份证', visitReasonName: '商务会议', areaName: '一期主楼', num: '1', period: '1', picture: '' }
-      //   ]
-      //   that.list = that.list.map(item => {
-      //     item.IDcardm = that.encrypIdCardNo(item.IDcard)
-      //     return item
-      //   })
-      //   that.total = 200
-      //   that.listLoading = false
-      // }, 100)
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {