diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 6402bb1..7e22102 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { printCountByDept } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PrintAnalysis',
   data() {
@@ -41,10 +42,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 6402bb1..7e22102 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { printCountByDept } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PrintAnalysis',
   data() {
@@ -41,10 +42,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 9f0ca56..8e68d11 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { peopleCountByDevice } from '@/api/statistics'
-// import { jobStaticsByDept } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'TempAnalysis',
@@ -17,7 +17,8 @@
         'normal': '体温正常',
         'abnormal': '体温异常'
       },
-      stack: { '体温': ['normal', 'abnormal'] }
+      stack: { '体温': ['normal', 'abnormal'] },
+      filterZero: true
     }
     this.chartExtends = {
       color: ['#36a3f7', '#f4516c'],
@@ -27,7 +28,10 @@
           interval: 0,
           rotate: 45 // 代表逆时针旋转45度
         }
-      }
+      },
+      yAxis: {
+        minInterval: 1 },
+      filterZero: true
     }
     return {
       isLegendVisible: true,
@@ -46,10 +50,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
@@ -62,7 +66,21 @@
           data0['abnormal'] = 0
           data0['normal'] = 0
           data.push(data0)
+          this.chartExtends.yAxis.max = 10
+        } else {
+          var indexDelete = []
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].abnormal) === 0 && parseInt(data[i].normal) === 0) {
+              indexDelete.push({ 'index': i })
+            }
+          }
+          if (indexDelete.length > 0) {
+            for (var j = 0; j < indexDelete.length; j++) {
+              data.splice(parseInt(indexDelete[j].index), 1)
+            }
+          }
         }
+        debugger
         this.chartData.rows = data
       })
     }

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 6402bb1..7e22102 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { printCountByDept } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PrintAnalysis',
   data() {
@@ -41,10 +42,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 9f0ca56..8e68d11 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { peopleCountByDevice } from '@/api/statistics'
-// import { jobStaticsByDept } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'TempAnalysis',
@@ -17,7 +17,8 @@
         'normal': '体温正常',
         'abnormal': '体温异常'
       },
-      stack: { '体温': ['normal', 'abnormal'] }
+      stack: { '体温': ['normal', 'abnormal'] },
+      filterZero: true
     }
     this.chartExtends = {
       color: ['#36a3f7', '#f4516c'],
@@ -27,7 +28,10 @@
           interval: 0,
           rotate: 45 // 代表逆时针旋转45度
         }
-      }
+      },
+      yAxis: {
+        minInterval: 1 },
+      filterZero: true
     }
     return {
       isLegendVisible: true,
@@ -46,10 +50,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
@@ -62,7 +66,21 @@
           data0['abnormal'] = 0
           data0['normal'] = 0
           data.push(data0)
+          this.chartExtends.yAxis.max = 10
+        } else {
+          var indexDelete = []
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].abnormal) === 0 && parseInt(data[i].normal) === 0) {
+              indexDelete.push({ 'index': i })
+            }
+          }
+          if (indexDelete.length > 0) {
+            for (var j = 0; j < indexDelete.length; j++) {
+              data.splice(parseInt(indexDelete[j].index), 1)
+            }
+          }
         }
+        debugger
         this.chartData.rows = data
       })
     }
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index 17bb950..f1404bb 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -1,9 +1,10 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyTime } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'TempOneDay',
   data() {
@@ -17,6 +18,9 @@
       metrics: ['temp'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'temp'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      // const date = new Date().toLocaleDateString().split('/').join('-')
-      const date = '2020-05-15'
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].temp) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 6402bb1..7e22102 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { printCountByDept } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PrintAnalysis',
   data() {
@@ -41,10 +42,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 9f0ca56..8e68d11 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { peopleCountByDevice } from '@/api/statistics'
-// import { jobStaticsByDept } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'TempAnalysis',
@@ -17,7 +17,8 @@
         'normal': '体温正常',
         'abnormal': '体温异常'
       },
-      stack: { '体温': ['normal', 'abnormal'] }
+      stack: { '体温': ['normal', 'abnormal'] },
+      filterZero: true
     }
     this.chartExtends = {
       color: ['#36a3f7', '#f4516c'],
@@ -27,7 +28,10 @@
           interval: 0,
           rotate: 45 // 代表逆时针旋转45度
         }
-      }
+      },
+      yAxis: {
+        minInterval: 1 },
+      filterZero: true
     }
     return {
       isLegendVisible: true,
@@ -46,10 +50,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
@@ -62,7 +66,21 @@
           data0['abnormal'] = 0
           data0['normal'] = 0
           data.push(data0)
+          this.chartExtends.yAxis.max = 10
+        } else {
+          var indexDelete = []
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].abnormal) === 0 && parseInt(data[i].normal) === 0) {
+              indexDelete.push({ 'index': i })
+            }
+          }
+          if (indexDelete.length > 0) {
+            for (var j = 0; j < indexDelete.length; j++) {
+              data.splice(parseInt(indexDelete[j].index), 1)
+            }
+          }
         }
+        debugger
         this.chartData.rows = data
       })
     }
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index 17bb950..f1404bb 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -1,9 +1,10 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyTime } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'TempOneDay',
   data() {
@@ -17,6 +18,9 @@
       metrics: ['temp'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'temp'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      // const date = new Date().toLocaleDateString().split('/').join('-')
-      const date = '2020-05-15'
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].temp) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/tempSevenDay.vue b/src/views/dashboard/components/tempSevenDay.vue
index c27cdbc..0defcee 100644
--- a/src/views/dashboard/components/tempSevenDay.vue
+++ b/src/views/dashboard/components/tempSevenDay.vue
@@ -1,9 +1,10 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'TempSevenDay',
   data() {
@@ -17,6 +18,9 @@
       metrics: ['temp'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'temp'],
@@ -32,20 +36,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].temp) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }

diff --git a/config/dev.env.js b/config/dev.env.js
index de005f8..d0398c7 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://111.198.10.15:20005"'
-  BASE_API: '"http://192.168.0.18:8093"'
+  // BASE_API: '"111.198.10.15:11802"'
+  // BASE_API: '"http://192.168.0.18:8095"'
+  BASE_API: '"http://192.168.0.166:8093"'
 })
diff --git a/src/components/BigData/CardPro/index.vue b/src/components/BigData/CardPro/index.vue
new file mode 100644
index 0000000..bca75e8
--- /dev/null
+++ b/src/components/BigData/CardPro/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card :body-style="{ padding: '0px' }" shadow="always">
+    <div :style="backgroundColor" class="card-panel">
+      <div class="card-panel-icon-wrapper">
+        <svg-icon :icon-class="icon" class-name="card-panel-icon" />
+      </div>
+      <div class="card-panel-description">
+        <div class="card-panel-text">
+          {{ title }}
+        </div>
+        <div class="card-panel-num" >
+          {{ context }}
+        </div>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'CardPro',
+  props: {
+    title: {
+      type: String,
+      default: '标题'
+    },
+    subtitle: {
+      type: String,
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: ''
+    },
+    context: {
+      type: [String, Number],
+      default: ''
+    },
+    color: {
+      type: String,
+      default: '#40c9c6'
+    }
+  },
+  computed: {
+    backgroundColor() {
+      return {
+        // color: this.color,
+        'background-color': this.color
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .card-panel {
+    height: 192px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #ffffff;
+    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: #ffffff;
+      }
+    }
+
+    .card-panel-icon-wrapper {
+      margin: 16px 0 0 0px;
+      padding: 14px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+      text-align: center;
+    }
+
+    .card-panel-icon {
+      font-size: 58px;
+    }
+
+    .card-panel-description {
+      font-weight: bold;
+      margin: 26px;
+      /*margin-left: 10px;*/
+      text-align: center;
+
+      .card-panel-text {
+        line-height: 22px;
+        color: #ffffff;
+        font-size: 20px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 6eb8d51..d8a2486 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
 Vue.use(VCharts)
 
 // 配置是否启用考勤功能
-export const attendanceEnable = false
+export const attendanceEnable = true
 
 new Vue({
   el: '#app',
diff --git a/src/views/dashboard/components/PanelGroupPro.vue b/src/views/dashboard/components/PanelGroupPro.vue
new file mode 100644
index 0000000..037f45d
--- /dev/null
+++ b/src/views/dashboard/components/PanelGroupPro.vue
@@ -0,0 +1,236 @@
+<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-pro :title="card.title" :context="card.context" :icon="card.icon" :color="card.color" @click.native="goPage(card.path)"/>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CardPro from '@/components/BigData/CardPro/index'
+// import { wellCountByBfzt } from '@/api/well'
+// import { deviceStaticByStatus, alarmNowStatic } from '@/api/dataStatics'
+// import { jobCountByStatus } from '@/api/job'
+export default {
+  components: {
+    CardPro
+  },
+  data() {
+    return {
+      dataGroup: [
+        {
+          title: '门禁授权',
+          context: '',
+          icon: 'icon-key',
+          color: '#40c9c6',
+          path: '/acsPermission',
+          permission: '/accessPermission'
+        },
+        {
+          title: '门禁管理',
+          context: '',
+          icon: 'icon-door',
+          color: '#36a3f7',
+          path: '/listDoor',
+          permission: '/door'
+        },
+        {
+          title: '员工管理',
+          context: '',
+          icon: 'icon-person',
+          color: '#f78586',
+          path: '/staff',
+          permission: '/staff'
+        },
+        {
+          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'
+        }
+      ]
+    }
+  },
+  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
+    }
+  },
+  methods: {
+    goPage(path) {
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    padding-right: 20px;
+    .card-panel-col {
+      margin-bottom: 22px;
+    }
+
+    .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);
+
+      &: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 {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-money {
+        color: #f4516c;
+      }
+
+      .icon-shopping {
+        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;
+        }
+      }
+    }
+  }
+
+  @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;
+      }
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/passAnalysis.vue b/src/views/dashboard/components/passAnalysis.vue
index 2924188..a841e49 100644
--- a/src/views/dashboard/components/passAnalysis.vue
+++ b/src/views/dashboard/components/passAnalysis.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDept } from '@/api/statistics'
 
 export default {
@@ -44,10 +45,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passCount.vue b/src/views/dashboard/components/passCount.vue
index 44c57f1..61e315b 100644
--- a/src/views/dashboard/components/passCount.vue
+++ b/src/views/dashboard/components/passCount.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { peopleCountByDevice } from '@/api/statistics'
 
 export default {
@@ -26,17 +27,7 @@
     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' }
-        ]
+        rows: []
       }
     }
   },
@@ -48,10 +39,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/passOneDay.vue b/src/views/dashboard/components/passOneDay.vue
index 5ed9b85..c2a52ac 100644
--- a/src/views/dashboard/components/passOneDay.vue
+++ b/src/views/dashboard/components/passOneDay.vue
@@ -1,8 +1,9 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
+import { getDayTime } from '@/utils/dateutils'
 import { countbyTime } from '@/api/statistics'
 export default {
   name: 'PassOneDay',
@@ -17,6 +18,9 @@
       metrics: ['total'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'total'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      const date = new Date().toLocaleDateString().split('/').join('-')
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
       // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/passSevenDay.vue b/src/views/dashboard/components/passSevenDay.vue
index 14dae01..129e7d1 100644
--- a/src/views/dashboard/components/passSevenDay.vue
+++ b/src/views/dashboard/components/passSevenDay.vue
@@ -1,9 +1,11 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
+
 export default {
   name: 'PassSevenDay',
   data() {
@@ -17,6 +19,9 @@
       metrics: ['total'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'total'],
@@ -32,20 +37,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].total) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue
index 6402bb1..7e22102 100644
--- a/src/views/dashboard/components/printAnalysis.vue
+++ b/src/views/dashboard/components/printAnalysis.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { printCountByDept } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PrintAnalysis',
   data() {
@@ -41,10 +42,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
diff --git a/src/views/dashboard/components/tempAnalysis.vue b/src/views/dashboard/components/tempAnalysis.vue
index 9f0ca56..8e68d11 100644
--- a/src/views/dashboard/components/tempAnalysis.vue
+++ b/src/views/dashboard/components/tempAnalysis.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { peopleCountByDevice } from '@/api/statistics'
-// import { jobStaticsByDept } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name: 'TempAnalysis',
@@ -17,7 +17,8 @@
         'normal': '体温正常',
         'abnormal': '体温异常'
       },
-      stack: { '体温': ['normal', 'abnormal'] }
+      stack: { '体温': ['normal', 'abnormal'] },
+      filterZero: true
     }
     this.chartExtends = {
       color: ['#36a3f7', '#f4516c'],
@@ -27,7 +28,10 @@
           interval: 0,
           rotate: 45 // 代表逆时针旋转45度
         }
-      }
+      },
+      yAxis: {
+        minInterval: 1 },
+      filterZero: true
     }
     return {
       isLegendVisible: true,
@@ -46,10 +50,10 @@
   },
   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 startTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 00:00:00'
+      const endTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd') + ' 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
@@ -62,7 +66,21 @@
           data0['abnormal'] = 0
           data0['normal'] = 0
           data.push(data0)
+          this.chartExtends.yAxis.max = 10
+        } else {
+          var indexDelete = []
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].abnormal) === 0 && parseInt(data[i].normal) === 0) {
+              indexDelete.push({ 'index': i })
+            }
+          }
+          if (indexDelete.length > 0) {
+            for (var j = 0; j < indexDelete.length; j++) {
+              data.splice(parseInt(indexDelete[j].index), 1)
+            }
+          }
         }
+        debugger
         this.chartData.rows = data
       })
     }
diff --git a/src/views/dashboard/components/tempOneDay.vue b/src/views/dashboard/components/tempOneDay.vue
index 17bb950..f1404bb 100644
--- a/src/views/dashboard/components/tempOneDay.vue
+++ b/src/views/dashboard/components/tempOneDay.vue
@@ -1,9 +1,10 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyTime } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'TempOneDay',
   data() {
@@ -17,6 +18,9 @@
       metrics: ['temp'],
       dimension: ['time']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['time', 'temp'],
@@ -32,16 +36,25 @@
   },
   methods: {
     fetchData() {
-      // const date = new Date().toLocaleDateString().split('/').join('-')
-      const date = '2020-05-15'
+      const date = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // const date = '2020-05-15'
       const listQuery = {
         date: date
       }
       countbyTime(listQuery).then(response => {
         const data = response.data
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].temp) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/components/tempSevenDay.vue b/src/views/dashboard/components/tempSevenDay.vue
index c27cdbc..0defcee 100644
--- a/src/views/dashboard/components/tempSevenDay.vue
+++ b/src/views/dashboard/components/tempSevenDay.vue
@@ -1,9 +1,10 @@
 <template>
-  <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <ve-line :data="chartData" :title="title" :settings="chartSettings" :extend="chartExtend"/>
 </template>
 
 <script>
 import { countbyDay } from '@/api/statistics'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'TempSevenDay',
   data() {
@@ -17,6 +18,9 @@
       metrics: ['temp'],
       dimension: ['date']
     }
+    this.chartExtend = {
+      yAxis: { minInterval: 1 }
+    }
     return {
       chartData: {
         columns: ['date', 'temp'],
@@ -32,20 +36,28 @@
   },
   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 startDate = getDayTime(new Date().getTime() - 24 * 6 * 60 * 60 * 1000).Format('yyyy-MM-dd')
+      const endDate = getDayTime(new Date().getTime()).Format('yyyy-MM-dd')
+      // 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
+        var hasData = false
         if (data.length !== 0) {
-          this.chartData.rows = data
+          for (var i = 0; i < data.length; i++) {
+            if (parseInt(data[i].temp) !== 0) {
+              hasData = true
+            }
+          }
         }
+        if (!hasData) {
+          this.chartExtend.yAxis.max = 10
+        }
+        this.chartData.rows = data
       })
     }
   }
diff --git a/src/views/dashboard/indexPro.vue b/src/views/dashboard/indexPro.vue
new file mode 100644
index 0000000..de77c57
--- /dev/null
+++ b/src/views/dashboard/indexPro.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="dashboard-container">
+    <el-row>
+      <el-col :span="16">
+        <el-card class="welcome-card">
+          <span class="dashboard-text">欢迎您，{{ name }} !</span>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <clock/>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="16">
+        <panel-group-pro/>
+      </el-col>
+      <el-col :span="8">
+        <calendar/>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Calendar from '../../components/Calendar/calendar'
+import Clock from '../../components/Clock/clock'
+import PanelGroupPro from './components/PanelGroupPro'
+
+export default {
+  name: 'Dashboard',
+  components: { PanelGroupPro, Clock, Calendar },
+  computed: {
+    ...mapGetters([
+      'name',
+      'roleNames',
+      'roleTips',
+      'wellTypes',
+      'deviceTypes',
+      'communications',
+      'area'
+    ])
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dashboard {
+    &-container {
+      margin: 30px;
+    }
+    &-text {
+      font-size: 26px;
+      line-height: 40px;
+      padding: 10px;
+    }
+  }
+  .welcome-card{
+    margin-right:20px;
+  }
+</style>