diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
new file mode 100644
index 0000000..6402bb1
--- /dev/null
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -0,0 +1,66 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { printCountByDept } from '@/api/statistics'
+export default {
+  name: 'PrintAnalysis',
+  data() {
+    this.title = {
+      text: '打印情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      printCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
new file mode 100644
index 0000000..6402bb1
--- /dev/null
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -0,0 +1,66 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { printCountByDept } from '@/api/statistics'
+export default {
+  name: 'PrintAnalysis',
+  data() {
+    this.title = {
+      text: '打印情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      printCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
new file mode 100644
index 0000000..9f0ca56
--- /dev/null
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -0,0 +1,71 @@
+<template>
+  <ve-histogram :data="chartData" :title="title" :legend-visible="isLegendVisible" :tooltip-visible="isTipShow" :settings="chartSettings" :extend="chartExtends"/>
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+// import { jobStaticsByDept } from '@/api/dataStatics'
+
+export default {
+  name: 'TempAnalysis',
+  data() {
+    this.title = {
+      text: '测温情况分析'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'normal': '体温正常',
+        'abnormal': '体温异常'
+      },
+      stack: { '体温': ['normal', 'abnormal'] }
+    }
+    this.chartExtends = {
+      color: ['#36a3f7', '#f4516c'],
+      barWidth: 20,
+      xAxis: {
+        axisLabel: {
+          interval: 0,
+          rotate: 45 // 代表逆时针旋转45度
+        }
+      }
+    }
+    return {
+      isLegendVisible: true,
+      isTipShow: true,
+      chartData: {
+        columns: ['deviceName', 'normal', 'abnormal'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['abnormal'] = 0
+          data0['normal'] = 0
+          data.push(data0)
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
new file mode 100644
index 0000000..6402bb1
--- /dev/null
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -0,0 +1,66 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { printCountByDept } from '@/api/statistics'
+export default {
+  name: 'PrintAnalysis',
+  data() {
+    this.title = {
+      text: '打印情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      printCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
new file mode 100644
index 0000000..9f0ca56
--- /dev/null
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -0,0 +1,71 @@
+<template>
+  <ve-histogram :data="chartData" :title="title" :legend-visible="isLegendVisible" :tooltip-visible="isTipShow" :settings="chartSettings" :extend="chartExtends"/>
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+// import { jobStaticsByDept } from '@/api/dataStatics'
+
+export default {
+  name: 'TempAnalysis',
+  data() {
+    this.title = {
+      text: '测温情况分析'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'normal': '体温正常',
+        'abnormal': '体温异常'
+      },
+      stack: { '体温': ['normal', 'abnormal'] }
+    }
+    this.chartExtends = {
+      color: ['#36a3f7', '#f4516c'],
+      barWidth: 20,
+      xAxis: {
+        axisLabel: {
+          interval: 0,
+          rotate: 45 // 代表逆时针旋转45度
+        }
+      }
+    }
+    return {
+      isLegendVisible: true,
+      isTipShow: true,
+      chartData: {
+        columns: ['deviceName', 'normal', 'abnormal'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['abnormal'] = 0
+          data0['normal'] = 0
+          data.push(data0)
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
new file mode 100644
index 0000000..17bb950
--- /dev/null
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'TempOneDay',
+  data() {
+    this.title = {
+      text: '单日测温趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'temp': '测温人数'
+      },
+      metrics: ['temp'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'temp'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
new file mode 100644
index 0000000..6402bb1
--- /dev/null
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -0,0 +1,66 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { printCountByDept } from '@/api/statistics'
+export default {
+  name: 'PrintAnalysis',
+  data() {
+    this.title = {
+      text: '打印情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      printCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
new file mode 100644
index 0000000..9f0ca56
--- /dev/null
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -0,0 +1,71 @@
+<template>
+  <ve-histogram :data="chartData" :title="title" :legend-visible="isLegendVisible" :tooltip-visible="isTipShow" :settings="chartSettings" :extend="chartExtends"/>
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+// import { jobStaticsByDept } from '@/api/dataStatics'
+
+export default {
+  name: 'TempAnalysis',
+  data() {
+    this.title = {
+      text: '测温情况分析'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'normal': '体温正常',
+        'abnormal': '体温异常'
+      },
+      stack: { '体温': ['normal', 'abnormal'] }
+    }
+    this.chartExtends = {
+      color: ['#36a3f7', '#f4516c'],
+      barWidth: 20,
+      xAxis: {
+        axisLabel: {
+          interval: 0,
+          rotate: 45 // 代表逆时针旋转45度
+        }
+      }
+    }
+    return {
+      isLegendVisible: true,
+      isTipShow: true,
+      chartData: {
+        columns: ['deviceName', 'normal', 'abnormal'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['abnormal'] = 0
+          data0['normal'] = 0
+          data.push(data0)
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
new file mode 100644
index 0000000..17bb950
--- /dev/null
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'TempOneDay',
+  data() {
+    this.title = {
+      text: '单日测温趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'temp': '测温人数'
+      },
+      metrics: ['temp'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'temp'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempSevenDay.vue b/src/views/dashboard/components/tempSevenDay.vue
new file mode 100644
index 0000000..c27cdbc
--- /dev/null
+++ b/src/views/dashboard/components/tempSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'TempSevenDay',
+  data() {
+    this.title = {
+      text: '七日测温趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'temp': '测温人数'
+      },
+      metrics: ['temp'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'temp'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/device.js b/src/api/device.js
index 6dcf2de..c9ba415 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -124,3 +124,10 @@
     }
   })
 }
+
+export function countByType() {
+  return request({
+    url: 'device/countByType',
+    method: 'get'
+  })
+}
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 0bbf9d6..d149a26 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -20,3 +20,44 @@
     params
   })
 }
+
+export function peopleCountByDevice(params) {
+  return request({
+    url: 'statistic/peopleCountByDevice',
+    method: 'get',
+    params
+  })
+}
+
+export function peopleCountByDept(params) {
+  return request({
+    url: 'statistic/peopleCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function printCountByDept(params) {
+  return request({
+    url: 'statistic/printCountByDept',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyTime(params) {
+  return request({
+    url: 'statistic/countbyTime',
+    method: 'get',
+    params
+  })
+}
+
+export function countbyDay(params) {
+  return request({
+    url: 'statistic/countbyDay',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 3f29913..daf4f41 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card :body-style="{ padding: '0px' }" shadow="always">
-    <div :style="backgroundColor" class="card-panel">
-      <div class="card-panel-icon-wrapper">
+    <div class="card-panel" >
+      <div :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon" />
       </div>
       <div class="card-panel-description">
@@ -44,8 +44,7 @@
   computed: {
     backgroundColor() {
       return {
-        // color: this.color,
-        'background-color': this.color
+        color: this.color
       }
     }
   }
@@ -54,7 +53,7 @@
 
 <style lang="scss" scoped>
   .card-panel {
-    height: 192px;
+    height: 108px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -71,32 +70,34 @@
   }
 
   .card-panel-icon-wrapper {
-    margin: 16px 0 0 0px;
-    padding: 14px;
+    float: left;
+    margin: 14px 0 0 14px;
+    padding: 16px;
     transition: all 0.38s ease-out;
     border-radius: 6px;
-    text-align: center;
   }
 
   .card-panel-icon {
-    font-size: 58px;
+    float: left;
+    font-size: 48px;
   }
 
   .card-panel-description {
+    float: left;
     font-weight: bold;
     margin: 26px;
-    /*margin-left: 10px;*/
-    text-align: center;
+    margin-left: 10px;
 
   .card-panel-text {
-    line-height: 22px;
-    color: #ffffff;
-    font-size: 20px;
+    line-height: 18px;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 16px;
     margin-bottom: 12px;
   }
 
   .card-panel-num {
     font-size: 20px;
+    color: rgba(0, 0, 0, 0.45);
   }
   }
   }
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index 3965d01..954b1bf 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -71,7 +71,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
@@ -79,7 +79,7 @@
             <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 140px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 808c0ee..6eddd90 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -1,16 +1,16 @@
 <template>
-  <el-row :gutter="10" class="panel-group">
-    <el-col v-for="card in dataFilter" :key="card.title" :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
-    </el-col>
+  <el-row :gutter="40" class="panel-group">
+    <div v-for="card in dataGroup" :key="card.title">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <card :title="card.title" :context="card.context" :icon="card.icon" :color="card.color"/>
+      </el-col>
+    </div>
   </el-row>
 </template>
 
 <script>
 import Card from '@/components/BigData/Card'
-// import { wellCountByBfzt } from '@/api/well'
-// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
-// import { jobCountByStatus } from '@/api/job'
+import { countByType } from '@/api/device'
 export default {
   components: {
     Card
@@ -19,218 +19,161 @@
     return {
       dataGroup: [
         {
-          title: '门禁授权',
-          context: '',
-          icon: 'icon-key',
-          color: '#40c9c6',
-          path: '/acsPermission',
-          permission: '/accessPermission'
+          title: '设备总数',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/wellList'
         },
         {
-          title: '门禁管理',
-          context: '',
-          icon: 'icon-door',
-          color: '#36a3f7',
-          path: '/listDoor',
-          permission: '/door'
+          title: '测温设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#f4516c'
+          // path: '/deviceList'
         },
         {
-          title: '员工管理',
-          context: '',
-          icon: 'icon-person',
-          color: '#f78586',
-          path: '/staff',
-          permission: '/staff'
+          title: '门禁设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#40c9c6'
+          // path: '/alarmNow'
         },
         {
-          title: '访客管理',
-          context: '',
-          icon: 'icon-visitor',
-          color: '#ffb980',
-          path: '/visitor',
-          permission: '/visitor'
-        },
-        {
-          title: '员工进出记录',
-          context: '',
-          icon: 'icon-step-staff',
-          color: '#c4b4e4',
-          path: '/querystaff',
-          permission: '/query/staff'
-        },
-        {
-          title: '访客进出记录',
-          context: '',
-          icon: 'icon-step-visitor',
-          color: '#0067a6',
-          path: '/queryvisitor',
-          permission: '/query/visitor'
-        },
-        {
-          title: '进出记录统计',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/statics',
-          permission: '/statistics'
-        },
-        {
-          title: '识别记录',
-          context: '',
-          icon: 'log',
-          color: '#34bfa3',
-          path: '/record',
-          permission: '/record'
-        },
-        {
-          title: '设备管理',
-          context: '',
-          icon: 'chart-pie',
-          color: '#d87a80',
-          path: '/device',
-          permission: '/device'
-        },
-        {
-          title: '登录日志',
-          context: '',
-          icon: 'log',
-          color: '#9cbbff',
-          path: '/loginLog',
-          permission: '/loginLog'
+          title: '打印设备',
+          context: '--',
+          icon: 'icon-device',
+          color: '#36a3f7'
+          // path: '/listJob'
         }
       ]
     }
   },
-  computed: {
-    dataFilter() {
-      const btns = this.$store.getters.menus
-      // 获取用户全部权限url
-      const permissions = btns.map(function(v) { return v.url })
-      // 过滤dataGroup
-      const datas = this.dataGroup.filter((item) => {
-        console.log(permissions.indexOf(item.path))
-        if (permissions.indexOf(item.permission) !== -1) {
-          return true
-        } else {
-          return false
-        }
-      })
-      return datas
-    }
+  created() {
+    this.getDeviceCount()
   },
   methods: {
     goPage(path) {
-      this.$router.push(path)
+      // this.$router.push(path)
+    },
+    getDeviceCount() {
+      countByType().then(response => {
+        this.dataGroup[0].context = response.data.total
+        this.dataGroup[1].context = response.data.temp
+        this.dataGroup[2].context = response.data.door
+        this.dataGroup[3].context = response.data.print
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  padding-right: 20px;
-  .card-panel-col {
-    margin-bottom: 22px;
-  }
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel {
-    height: 100px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: #40c9c6;
+        }
+
+        .icon-message {
+          background: #36a3f7;
+        }
+
+        .icon-money {
+          background: #f4516c;
+        }
+
+        .icon-shopping {
+          background: #34bfa3
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        color: #40c9c6;
       }
 
       .icon-message {
-        background: #36a3f7;
+        color: #36a3f7;
       }
 
       .icon-money {
-        background: #f4516c;
+        color: #f4516c;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
       }
     }
+  }
 
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
     }
 
     .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
new file mode 100644
index 0000000..2924188
--- /dev/null
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { peopleCountByDept } from '@/api/statistics'
+
+export default {
+  name: 'PassAnalysis',
+  data() {
+    this.title = {
+      text: '通行情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      isLegendVisible: true,
+      isTipVisible: true,
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
new file mode 100644
index 0000000..44c57f1
--- /dev/null
+++ b/src/views/dashboard/components/passCount.vue
@@ -0,0 +1,73 @@
+<template>
+  <ve-ring :data="chartData" :title="title" :settings="chartSettings" :legend="legends" />
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+
+export default {
+  name: 'PassCount',
+  data() {
+    this.title = {
+      text: '通行人数'
+    }
+    this.legends = {
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['deviceName', 'count'],
+        rows: [
+          { 'deviceName': '设备1', 'count': '23' },
+          { 'deviceName': '设备2', 'count': '23' },
+          { 'deviceName': '设备3', 'count': '23' },
+          { 'deviceName': '设备5', 'count': '23' },
+          { 'deviceName': '设备6', 'count': '23' },
+          { 'deviceName': '设备7', 'count': '23' },
+          { 'deviceName': '设备8', 'count': '23' },
+          { 'deviceName': '设备9', 'count': '23' },
+          { 'deviceName': '设备4', 'count': '23' }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['count'] = 0
+          data.push(data0)
+          this.chartSettings.label.normal.show = false
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
new file mode 100644
index 0000000..5ed9b85
--- /dev/null
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'PassOneDay',
+  data() {
+    this.title = {
+      text: '单日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '通行人数'
+      },
+      metrics: ['total'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      const date = new Date().toLocaleDateString().split('/').join('-')
+      // const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
new file mode 100644
index 0000000..79ecef6
--- /dev/null
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'PassSevenDay',
+  data() {
+    this.title = {
+      text: '七日通行趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'total': '测温人数'
+      },
+      metrics: ['total'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'total'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
new file mode 100644
index 0000000..6402bb1
--- /dev/null
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -0,0 +1,66 @@
+<template>
+  <ve-pie :data="chartData" :title="title" :legend="legends" :tooltip="tooltip" :settings="chartSettings"/>
+</template>
+
+<script>
+import { printCountByDept } from '@/api/statistics'
+export default {
+  name: 'PrintAnalysis',
+  data() {
+    this.title = {
+      text: '打印情况分析'
+    }
+    this.chartSettings = {
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    }
+    this.legends = {
+      show: true,
+      orient: 'horizontal',
+      x: 'right', // 可设定图例在左、右、居中
+      padding: [0, 0, 0, 100]
+    }
+    this.tooltip = {
+      show: true
+    }
+    return {
+      chartData: {
+        columns: ['deptName', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      printCountByDept(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          if (data.length === 1 && data[0].count === 0) {
+            this.legends.show = false
+            this.tooltip.show = false
+            this.chartSettings.label.normal.show = false
+          }
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
new file mode 100644
index 0000000..9f0ca56
--- /dev/null
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -0,0 +1,71 @@
+<template>
+  <ve-histogram :data="chartData" :title="title" :legend-visible="isLegendVisible" :tooltip-visible="isTipShow" :settings="chartSettings" :extend="chartExtends"/>
+</template>
+
+<script>
+import { peopleCountByDevice } from '@/api/statistics'
+// import { jobStaticsByDept } from '@/api/dataStatics'
+
+export default {
+  name: 'TempAnalysis',
+  data() {
+    this.title = {
+      text: '测温情况分析'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'normal': '体温正常',
+        'abnormal': '体温异常'
+      },
+      stack: { '体温': ['normal', 'abnormal'] }
+    }
+    this.chartExtends = {
+      color: ['#36a3f7', '#f4516c'],
+      barWidth: 20,
+      xAxis: {
+        axisLabel: {
+          interval: 0,
+          rotate: 45 // 代表逆时针旋转45度
+        }
+      }
+    }
+    return {
+      isLegendVisible: true,
+      isTipShow: true,
+      chartData: {
+        columns: ['deviceName', 'normal', 'abnormal'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const beginTime = (new Date().toLocaleDateString().split('/').join('-')) + ' 00:00:00'
+      // const endTime = new Date().toLocaleDateString().split('/').join('-') + ' 23:59:59'
+      const startTime = '2020-06-01 00:00:00'
+      const endTime = '2020-06-20 00:00:00'
+      const listQuery = {
+        startTime: startTime,
+        endTime: endTime
+      }
+      peopleCountByDevice(listQuery).then(response => {
+        const data = response.data
+        if (data.length === 0) {
+          var data0 = {}
+          data0['deviceName'] = ''
+          data0['abnormal'] = 0
+          data0['normal'] = 0
+          data.push(data0)
+        }
+        this.chartData.rows = data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
new file mode 100644
index 0000000..17bb950
--- /dev/null
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -0,0 +1,49 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyTime } from '@/api/statistics'
+export default {
+  name: 'TempOneDay',
+  data() {
+    this.title = {
+      text: '单日测温趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'temp': '测温人数'
+      },
+      metrics: ['temp'],
+      dimension: ['time']
+    }
+    return {
+      chartData: {
+        columns: ['time', 'temp'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = '2020-05-15'
+      const listQuery = {
+        date: date
+      }
+      countbyTime(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/tempSevenDay.vue b/src/views/dashboard/components/tempSevenDay.vue
new file mode 100644
index 0000000..c27cdbc
--- /dev/null
+++ b/src/views/dashboard/components/tempSevenDay.vue
@@ -0,0 +1,53 @@
+<template>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+</template>
+
+<script>
+import { countbyDay } from '@/api/statistics'
+export default {
+  name: 'TempSevenDay',
+  data() {
+    this.title = {
+      text: '七日测温趋势'
+    }
+    this.chartSettings = {
+      labelMap: {
+        'temp': '测温人数'
+      },
+      metrics: ['temp'],
+      dimension: ['date']
+    }
+    return {
+      chartData: {
+        columns: ['date', 'temp'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  activated() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      // const startDate = new Date(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).toLocaleDateString().split('/').join('-')
+      // const endDate = new Date().toLocaleDateString().split('/').join('-')
+      const startDate = '2020-05-10'
+      const endDate = '2020-05-16'
+      const listQuery = {
+        startDate: startDate,
+        endDate: endDate
+      }
+      debugger
+      countbyDay(listQuery).then(response => {
+        const data = response.data
+        if (data.length !== 0) {
+          this.chartData.rows = data
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8168513..1577e75 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,21 +1,54 @@
 <template>
   <div class="dashboard-container">
+    <panel-group ref="panelgroup"/>
     <el-row>
-      <el-col :span="16">
-        <el-card class="welcome-card">
-          <span class="dashboard-text">欢迎您，{{ name }} !</span>
+      <!--测温情况分析-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <temp-analysis/>
         </el-card>
       </el-col>
-      <el-col :span="8">
-        <clock/>
+      <!--通行人数统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <pass-count/>
+        </el-card>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="16">
-        <panel-group/>
+      <!--通行情况分析-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <pass-analysis/>
+        </el-card>
       </el-col>
-      <el-col :span="8">
-        <calendar/>
+      <!--打印情况分析-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <print-analysis/>
+        </el-card>
+      </el-col>
+      <!--单日测温趋势-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <temp-one-day/>
+        </el-card>
+      </el-col>
+      <!--单日通行趋势-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <pass-one-day/>
+        </el-card>
+      </el-col>
+      <!--七日测温趋势-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <temp-seven-day/>
+        </el-card>
+      </el-col>
+      <!--七日通行趋势-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <pass-seven-day/>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -23,22 +56,24 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import Calendar from '../../components/Calendar/calendar'
-import Clock from '../../components/Clock/clock'
 import PanelGroup from './components/PanelGroup'
-
+import TempAnalysis from './components/tempAnalysis'
+import PassCount from './components/passCount'
+import PassAnalysis from './components/passAnalysis'
+import PrintAnalysis from './components/printAnalysis'
+import TempOneDay from './components/tempOneDay'
+import PassOneDay from './components/passOneDay'
+import TempSevenDay from './components/tempSevenDay'
+import PassSevenDay from './components/passSevenDay'
 export default {
   name: 'Dashboard',
-  components: { PanelGroup, Clock, Calendar },
+  components: { PassSevenDay, TempSevenDay, PassOneDay, TempOneDay, PrintAnalysis, PassAnalysis, PassCount, TempAnalysis, PanelGroup },
   computed: {
     ...mapGetters([
       'name',
       'roleNames',
       'roleTips',
-      'wellTypes',
-      'deviceTypes',
-      'communications',
-      'area'
+      'communications'
     ])
   }
 }
@@ -50,12 +85,8 @@
     margin: 30px;
   }
   &-text {
-    font-size: 26px;
-    line-height: 40px;
-    padding: 10px;
+    font-size: 30px;
+    line-height: 46px;
   }
 }
-.welcome-card{
-  margin-right:20px;
-}
 </style>