diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 32a12e5..e13f811 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -1,3 +1,4 @@
+<!--报警分析-->
 <template>
   <panel-card title="报警分析">
     <template slot="func">
@@ -11,7 +12,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          @change="fetchDeviceTypeBar"
+          @change="refresh"
         />
       </el-col>
     </template>
@@ -65,11 +66,14 @@
   },
   created() {
     this.timeRange = getSearchLastWeekTime()
-    this.handleDateTime()
-    this.fetchAlarmByDay()
-    this.fetchAlarmByContent()
+    this.refresh()
   },
   methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchAlarmByDay()
+      this.fetchAlarmByContent()
+    },
     // 获取各类报警的列表
     fetchAlarmByContent() {
       alarmStaticsByContent(this.listQuery).then(response => {

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 32a12e5..e13f811 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -1,3 +1,4 @@
+<!--报警分析-->
 <template>
   <panel-card title="报警分析">
     <template slot="func">
@@ -11,7 +12,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          @change="fetchDeviceTypeBar"
+          @change="refresh"
         />
       </el-col>
     </template>
@@ -65,11 +66,14 @@
   },
   created() {
     this.timeRange = getSearchLastWeekTime()
-    this.handleDateTime()
-    this.fetchAlarmByDay()
-    this.fetchAlarmByContent()
+    this.refresh()
   },
   methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchAlarmByDay()
+      this.fetchAlarmByContent()
+    },
     // 获取各类报警的列表
     fetchAlarmByContent() {
       alarmStaticsByContent(this.listQuery).then(response => {
diff --git a/src/views/dataView/components/jobAnalysis.vue b/src/views/dataView/components/jobAnalysis.vue
new file mode 100644
index 0000000..483e652
--- /dev/null
+++ b/src/views/dataView/components/jobAnalysis.vue
@@ -0,0 +1,106 @@
+<!--工单情况-->
+<template>
+  <panel-card title="工单分析">
+    <template slot="func">
+      <el-col :span="16">
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="refresh"
+        />
+      </el-col>
+    </template>
+    <ve-bar
+      :data="chartData"
+      :extend="extend"
+      :settings="chartSettings"
+    />
+  </panel-card>
+</template>
+
+<script>
+import PanelCard from '@/components/BigData/Card/panelCard'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { jobStaticsByDept } from '@/api/data/dataStatics'
+export default {
+  name: 'JobAnalysis',
+  components: { PanelCard },
+  data() {
+    return {
+      listQuery: {
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      timeRange: [], // 时间范围
+      chartSettings: {
+        labelMap: {
+          'deptName': '权属单位',
+          'beforeGet': '待处理',
+          'beforeConfirm': '待确认',
+          'inHandle': '处理中',
+          'over': '已完成'
+        },
+        stack: {
+          'xxx': ['beforeGet', 'beforeConfirm', 'inHandle', 'over']
+        }
+      },
+      extend: {
+        xAxis: {
+          type: 'value',
+          minInterval: 1
+        },
+        series: {
+          barMaxWidth: 35
+        }
+      },
+      chartData: {
+        columns: ['deptName', 'beforeGet', 'beforeConfirm', 'inHandle', 'over'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.timeRange = getSearchLastWeekTime()
+    this.refresh()
+  },
+  mounted() {
+  },
+  methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchData()
+    },
+    fetchData() {
+      jobStaticsByDept(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.beforeGet) + parseInt(item.beforeConfirm) + parseInt(item.inHandle) + parseInt(item.over)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 10 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 32a12e5..e13f811 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -1,3 +1,4 @@
+<!--报警分析-->
 <template>
   <panel-card title="报警分析">
     <template slot="func">
@@ -11,7 +12,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          @change="fetchDeviceTypeBar"
+          @change="refresh"
         />
       </el-col>
     </template>
@@ -65,11 +66,14 @@
   },
   created() {
     this.timeRange = getSearchLastWeekTime()
-    this.handleDateTime()
-    this.fetchAlarmByDay()
-    this.fetchAlarmByContent()
+    this.refresh()
   },
   methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchAlarmByDay()
+      this.fetchAlarmByContent()
+    },
     // 获取各类报警的列表
     fetchAlarmByContent() {
       alarmStaticsByContent(this.listQuery).then(response => {
diff --git a/src/views/dataView/components/jobAnalysis.vue b/src/views/dataView/components/jobAnalysis.vue
new file mode 100644
index 0000000..483e652
--- /dev/null
+++ b/src/views/dataView/components/jobAnalysis.vue
@@ -0,0 +1,106 @@
+<!--工单情况-->
+<template>
+  <panel-card title="工单分析">
+    <template slot="func">
+      <el-col :span="16">
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="refresh"
+        />
+      </el-col>
+    </template>
+    <ve-bar
+      :data="chartData"
+      :extend="extend"
+      :settings="chartSettings"
+    />
+  </panel-card>
+</template>
+
+<script>
+import PanelCard from '@/components/BigData/Card/panelCard'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { jobStaticsByDept } from '@/api/data/dataStatics'
+export default {
+  name: 'JobAnalysis',
+  components: { PanelCard },
+  data() {
+    return {
+      listQuery: {
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      timeRange: [], // 时间范围
+      chartSettings: {
+        labelMap: {
+          'deptName': '权属单位',
+          'beforeGet': '待处理',
+          'beforeConfirm': '待确认',
+          'inHandle': '处理中',
+          'over': '已完成'
+        },
+        stack: {
+          'xxx': ['beforeGet', 'beforeConfirm', 'inHandle', 'over']
+        }
+      },
+      extend: {
+        xAxis: {
+          type: 'value',
+          minInterval: 1
+        },
+        series: {
+          barMaxWidth: 35
+        }
+      },
+      chartData: {
+        columns: ['deptName', 'beforeGet', 'beforeConfirm', 'inHandle', 'over'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.timeRange = getSearchLastWeekTime()
+    this.refresh()
+  },
+  mounted() {
+  },
+  methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchData()
+    },
+    fetchData() {
+      jobStaticsByDept(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.beforeGet) + parseInt(item.beforeConfirm) + parseInt(item.inHandle) + parseInt(item.over)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 10 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 1acd118..7cae96f 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -29,43 +29,20 @@
 <script>
 import Card from '@/components/BigData/Card'
 import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
+import { deviceStaticByStatus, alarmNowStatic, dataCount } from '@/api/data/dataStatics'
 import PanelCard from '@/components/BigData/Card/panelCard'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PanelGroup',
   components: { PanelCard, Card },
   data() {
     return {
-      dialogFormVisible: false,
-      listLoading: false,
       columns: [
-        {
-          text: '设备编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '最新记录上传时间',
-          width: '200',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '离线天数',
-          value: '',
-          align: 'center'
-        }
+        { text: '设备编号', value: '', align: 'center' },
+        { text: '设备类型', value: '', align: 'center' },
+        { text: '点位编号', value: '', align: 'center' },
+        { text: '最新记录上传时间', width: '200', value: '', align: 'center' },
+        { text: '离线天数', value: '', align: 'center' }
       ], // 显示列
       dataGroup: [
         {
@@ -88,25 +65,25 @@
           title: '今日数据',
           context: '--',
           flags: '条',
-          icon: 'icon-alarm',
-          color: '#f4516c',
-          permission: '/alarm/now'
+          icon: 'icon-database',
+          color: '#1ed8f3',
+          permission: '/data'
         },
         {
           title: '离线设备',
           context: '--',
           flags: '个',
-          icon: 'icon-order',
-          color: '#f4516c',
-          permission: '/job/list'
+          icon: 'icon-device',
+          color: '#676767',
+          permission: '/device/list'
         },
         {
           title: '当前报警',
           context: '--',
           flags: '条',
           icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
+          color: '#f4516c',
+          permission: '/alarm/now'
         }
       ]
     }
@@ -115,34 +92,36 @@
     this.getWellCount()
     this.getDeviceCount()
     this.getAlarmCount()
-    this.getJobCount()
+    this.getTodayDataCount()
   },
   methods: {
-    goPage(card) {
-      if (card.title === '离线设备') {
-        this.dialogFormVisible = true
-      }
-    },
+    // 获取井数量
     getWellCount() {
       wellCountByBfzt().then(response => {
         this.dataGroup[0].context = response.data.total
       })
     },
+    // 获取设备数量， 离线设备数量
     getDeviceCount() {
       deviceStaticByStatus().then(response => {
         this.dataGroup[1].context = response.data.total
+        this.dataGroup[3].context = response.data.offline
       })
     },
+    // 获取当前报警数量
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
+        this.dataGroup[4].context = response.data.total
       })
     },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
+    // 获取今日数据总数
+    getTodayDataCount() {
+      const beginTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      const params = { beginTime, endTime }
+      dataCount(params).then(response => {
+        debugger
+        this.dataGroup[2].context = response.data.total
       })
     }
   }

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 32a12e5..e13f811 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -1,3 +1,4 @@
+<!--报警分析-->
 <template>
   <panel-card title="报警分析">
     <template slot="func">
@@ -11,7 +12,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          @change="fetchDeviceTypeBar"
+          @change="refresh"
         />
       </el-col>
     </template>
@@ -65,11 +66,14 @@
   },
   created() {
     this.timeRange = getSearchLastWeekTime()
-    this.handleDateTime()
-    this.fetchAlarmByDay()
-    this.fetchAlarmByContent()
+    this.refresh()
   },
   methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchAlarmByDay()
+      this.fetchAlarmByContent()
+    },
     // 获取各类报警的列表
     fetchAlarmByContent() {
       alarmStaticsByContent(this.listQuery).then(response => {
diff --git a/src/views/dataView/components/jobAnalysis.vue b/src/views/dataView/components/jobAnalysis.vue
new file mode 100644
index 0000000..483e652
--- /dev/null
+++ b/src/views/dataView/components/jobAnalysis.vue
@@ -0,0 +1,106 @@
+<!--工单情况-->
+<template>
+  <panel-card title="工单分析">
+    <template slot="func">
+      <el-col :span="16">
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="refresh"
+        />
+      </el-col>
+    </template>
+    <ve-bar
+      :data="chartData"
+      :extend="extend"
+      :settings="chartSettings"
+    />
+  </panel-card>
+</template>
+
+<script>
+import PanelCard from '@/components/BigData/Card/panelCard'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { jobStaticsByDept } from '@/api/data/dataStatics'
+export default {
+  name: 'JobAnalysis',
+  components: { PanelCard },
+  data() {
+    return {
+      listQuery: {
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      timeRange: [], // 时间范围
+      chartSettings: {
+        labelMap: {
+          'deptName': '权属单位',
+          'beforeGet': '待处理',
+          'beforeConfirm': '待确认',
+          'inHandle': '处理中',
+          'over': '已完成'
+        },
+        stack: {
+          'xxx': ['beforeGet', 'beforeConfirm', 'inHandle', 'over']
+        }
+      },
+      extend: {
+        xAxis: {
+          type: 'value',
+          minInterval: 1
+        },
+        series: {
+          barMaxWidth: 35
+        }
+      },
+      chartData: {
+        columns: ['deptName', 'beforeGet', 'beforeConfirm', 'inHandle', 'over'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.timeRange = getSearchLastWeekTime()
+    this.refresh()
+  },
+  mounted() {
+  },
+  methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchData()
+    },
+    fetchData() {
+      jobStaticsByDept(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.beforeGet) + parseInt(item.beforeConfirm) + parseInt(item.inHandle) + parseInt(item.over)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 10 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 1acd118..7cae96f 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -29,43 +29,20 @@
 <script>
 import Card from '@/components/BigData/Card'
 import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
+import { deviceStaticByStatus, alarmNowStatic, dataCount } from '@/api/data/dataStatics'
 import PanelCard from '@/components/BigData/Card/panelCard'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PanelGroup',
   components: { PanelCard, Card },
   data() {
     return {
-      dialogFormVisible: false,
-      listLoading: false,
       columns: [
-        {
-          text: '设备编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '最新记录上传时间',
-          width: '200',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '离线天数',
-          value: '',
-          align: 'center'
-        }
+        { text: '设备编号', value: '', align: 'center' },
+        { text: '设备类型', value: '', align: 'center' },
+        { text: '点位编号', value: '', align: 'center' },
+        { text: '最新记录上传时间', width: '200', value: '', align: 'center' },
+        { text: '离线天数', value: '', align: 'center' }
       ], // 显示列
       dataGroup: [
         {
@@ -88,25 +65,25 @@
           title: '今日数据',
           context: '--',
           flags: '条',
-          icon: 'icon-alarm',
-          color: '#f4516c',
-          permission: '/alarm/now'
+          icon: 'icon-database',
+          color: '#1ed8f3',
+          permission: '/data'
         },
         {
           title: '离线设备',
           context: '--',
           flags: '个',
-          icon: 'icon-order',
-          color: '#f4516c',
-          permission: '/job/list'
+          icon: 'icon-device',
+          color: '#676767',
+          permission: '/device/list'
         },
         {
           title: '当前报警',
           context: '--',
           flags: '条',
           icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
+          color: '#f4516c',
+          permission: '/alarm/now'
         }
       ]
     }
@@ -115,34 +92,36 @@
     this.getWellCount()
     this.getDeviceCount()
     this.getAlarmCount()
-    this.getJobCount()
+    this.getTodayDataCount()
   },
   methods: {
-    goPage(card) {
-      if (card.title === '离线设备') {
-        this.dialogFormVisible = true
-      }
-    },
+    // 获取井数量
     getWellCount() {
       wellCountByBfzt().then(response => {
         this.dataGroup[0].context = response.data.total
       })
     },
+    // 获取设备数量， 离线设备数量
     getDeviceCount() {
       deviceStaticByStatus().then(response => {
         this.dataGroup[1].context = response.data.total
+        this.dataGroup[3].context = response.data.offline
       })
     },
+    // 获取当前报警数量
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
+        this.dataGroup[4].context = response.data.total
       })
     },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
+    // 获取今日数据总数
+    getTodayDataCount() {
+      const beginTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      const params = { beginTime, endTime }
+      dataCount(params).then(response => {
+        debugger
+        this.dataGroup[2].context = response.data.total
       })
     }
   }
diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue
index 82fe878..5c0e2d7 100644
--- a/src/views/dataView/components/wellCountView.vue
+++ b/src/views/dataView/components/wellCountView.vue
@@ -1,61 +1,70 @@
 <template>
-  <div>
-    <div class="flagBoxStyle">
-      <div class="flagStyle" />
-      <div>井数量分析</div>
-    </div>
-    <el-row :gutter="10">
+  <panel-card title="点位分析">
+    <el-row>
       <el-col :span="12">
-        <ve-pie
-          :data="chartDataPie"
-          :extend="extendPie"
-        />
+        <ve-pie :data="pieChartData" :extend="pieExtend" />
       </el-col>
       <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
+        <ve-bar :data="chartData" :grid="grid" :extend="extend" :settings="chartSettings" />
       </el-col>
     </el-row>
+  </panel-card>
+  <!--  <div>-->
+  <!--    <div class="flagBoxStyle">-->
+  <!--      <div class="flagStyle" />-->
+  <!--      <div>井数量分析</div>-->
+  <!--    </div>-->
+    <!--    <el-row :gutter="10">-->
+    <!--      <el-col :span="12">-->
+    <!--        <ve-pie-->
+    <!--          :data="chartDataPie"-->
+    <!--          :extend="extendPie"-->
+    <!--        />-->
+    <!--      </el-col>-->
+    <!--      <el-col :span="12">-->
+    <!--        <ve-bar-->
+    <!--          :data="chartData"-->
+    <!--          :grid="grid"-->
+    <!--          :extend="extend"-->
+    <!--          :settings="chartSettings"-->
+    <!--        />-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
   </div>
 </template>
 
 <script>
-import { deviceStaticsByOnline } from '@/api/data/dataStatics'
+import { deviceStaticsByOnline, wellStaticByBfzt, wellStaticByType } from '@/api/data/dataStatics'
+import PanelCard from '@/components/BigData/Card/panelCard'
 export default {
   name: 'WellCountView',
+  components: { PanelCard },
   data() {
     return {
-      online: 0,
-      offline: 0,
       // 饼状图
-      extendPie: {
+      pieExtend: {
         series: {
           label: { show: true, position: 'outside', formatter: '{b}:{c}' },
           radius: '45%'
         }
       },
-      chartDataPie: {
-        columns: ['onlineStatus', 'deviceCount'],
+      pieChartSettings: {
+        labelMap: {
+          'bfzt': '布防状态',
+          'wellCount': '井数量'
+        },
+        dimension: 'bfzt',
+        metrics: 'wellCount'
+      },
+      pieChartData: {
+        columns: ['bfzt', 'wellCount'],
         rows: []
       },
       // 柱状图
       extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
         series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
+          label: { show: true, position: 'right' },
+          barMaxWidth: 35
         }
       },
       grid: {
@@ -67,42 +76,36 @@
         },
         barWidth: 15,
         labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
+          'wellTypeName': '点位类型',
+          'wellCount': '井数量'
         },
-        dimension: ['deviceType'],
-        metrics: ['offline']
+        dimension: ['wellTypeName'],
+        metrics: ['wellCount']
       },
       chartData: {
-        columns: ['deviceType', 'offline'],
+        columns: ['wellTypeName', 'wellCount'],
         rows: []
       }
     }
   },
   created() {
-    this.fetchDeviceType()
+    this.fetchBfcfData()
+    this.fetchWellTypeData()
   },
   methods: {
-    fetchDeviceType() {
-      this.chartDataPie.rows = [
-        { 'onlineStatus': '在线', 'deviceCount': '10' },
-        { 'onlineStatus': '离线', 'deviceCount': '20' }
-      ]
-      this.chartData.rows = [
-        {
-
-        }
-      ]
-      deviceStaticsByOnline().then(response => {
-        response.data.forEach((item) => {
-          this.online += item.online
-          this.offline += item.offline
-        })
+    // 获取统计数据
+    fetchBfcfData() {
+      wellStaticByBfzt(this.listQuery).then(response => {
+        const data = response.data
+        this.pieChartData.rows = [
+          { 'bfzt': '布防', 'wellCount': data.bfWell },
+          { 'bfzt': '撤防', 'wellCount': data.cfWell }
+        ]
+      })
+    },
+    fetchWellTypeData() {
+      wellStaticByType().then(response => {
         this.chartData.rows = response.data
-        // this.chartDataPie.rows = [
-        //   { 'onlineStatus': '在线', 'deviceCount': this.online },
-        //   { 'onlineStatus': '离线', 'deviceCount': this.offline }
-        // ]
       })
     }
   }

diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index fdbc34f..d6b7a72 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -117,3 +117,12 @@
   })
 }
 
+// 获取数据总数
+export function dataCount(params) {
+  return request({
+    url: '/dataStatics/upLoadCountByTime',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1e22a69..ca7d72b 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -7,7 +7,7 @@
 // 设备查询
 export function getDeviceList(params) {
   return request({
-    url: 'device/list',
+    url: 'device/list-page',
     method: 'get',
     params
   })
diff --git a/src/icons/svg/icon-database.svg b/src/icons/svg/icon-database.svg
new file mode 100644
index 0000000..d3dd1c8
--- /dev/null
+++ b/src/icons/svg/icon-database.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1658711872102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1435" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 123.7C872.7 49.9 704.8 0 512 0S151.3 49.9 64 123.7C23.2 158.2 0 197.8 0 240V605.9c0 0.7 0 1.4 0.1 2H0v176c0 132.5 229.2 240 512 240s512-107.5 512-240V608h-0.1c0.1-1.8 0.1-3.5 0.1-5.3V240c0-42.2-23.2-81.8-64-116.3zM64 356.3C151.3 430.1 319.2 480 512 480s360.7-49.9 448-123.7v79.2c-17.9 11.5-37.5 22.2-58.8 32.2C796.2 516.9 658 544 512 544s-284.2-27.1-389.2-76.4c-21.3-10-40.9-20.7-58.8-32.2v-79.1z m0 181.3c87.3 73.8 255.2 123.7 448 123.7s360.7-49.9 448-123.7v79.2c-17.9 11.4-37.5 22.2-58.8 32.2-105 49.2-243.3 76.3-389.2 76.3S227.8 698.2 122.8 649c-21.3-10-40.9-20.7-58.8-32.2v-79.2z m837.2 292.7c-105 49.2-243.3 76.3-389.2 76.3s-284.2-27.1-389.2-76.3c-20.3-9.5-39.1-19.8-56.4-30.6-1.6-5.3-2.4-10.5-2.4-15.7v-65c87.3 73.8 255.2 123.7 448 123.7s360.7-50 448-123.7v65c0 5.1-0.8 10.4-2.4 15.7-17.3 10.9-36.1 21.1-56.4 30.6z" p-id="1436"></path></svg>
\ No newline at end of file
diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue
deleted file mode 100644
index f2b74b5..0000000
--- a/src/views/dataView/components/alarmStatus.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-row :gutter="40" class="panel-group">
-    <div>
-      <el-col>
-        <div class="flagBoxStyle">
-          <div class="flagStyle" />
-          <div>工单情况</div>
-        </div>
-      </el-col>
-    </div>
-    <el-row>
-      <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <div class="tableStyle">
-          <el-table border :data="tableList" stripe>
-            <el-table-column prop="name" label="设备型号" />
-            <el-table-column prop="value" label="设备名称" />
-          </el-table>
-        </div>
-      </el-col>
-    </el-row>
-  </el-row>
-</template>
-
-<script>
-import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
-export default {
-  name: 'AlarmStatus',
-  data() {
-    return {
-      // 柱状图
-      extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
-        series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
-        }
-      },
-      grid: {
-        right: 60
-      },
-      chartSettings: {
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        barWidth: 15,
-        labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
-        },
-        dimension: ['deviceType'],
-        metrics: ['offline']
-      },
-      chartData: {
-        columns: ['deviceType', 'offline'],
-        rows: []
-      },
-      tableList: [],
-      dataGroup: [
-        {
-          title: '井',
-          context: '--',
-          flags: '条',
-          icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
-        }
-      ]
-    }
-  },
-  created() {
-    this.getWellCount()
-    this.getDeviceCount()
-    this.getAlarmCount()
-    this.getJobCount()
-  },
-  mounted() {
-    this.tableList = [
-      {
-        value: 'WELL-001',
-        name: '液位超限'
-      },
-      {
-        value: 'WELL-002',
-        name: '燃气浓度超限'
-      },
-      {
-        value: 'WELL-003',
-        name: '井盖开启'
-      },
-      {
-        value: 'WELL-004',
-        name: '井盖开启'
-      }
-    ]
-  },
-  methods: {
-    refresh() {
-      this.getAlarmCount()
-      this.getJobCount()
-    },
-    getWellCount() {
-      wellCountByBfzt().then(response => {
-        this.dataGroup[0].context = response.data.total
-      })
-    },
-    getDeviceCount() {
-      deviceStaticByStatus().then(response => {
-        this.dataGroup[1].context = response.data.total
-      })
-    },
-    getAlarmCount() {
-      alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
-      })
-    },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tableStyle{
-  padding: 20px;
-}
-.flagBoxStyle {
-  display: flex;
-  margin-bottom: 20px;
-}
-.flagBoxStyle div:nth-child(2){
-  line-height: 30px;
-  font-weight: 600;
-}
-.flagStyle {
-  width: 4px;
-  height: 30px;
-  margin-right: 6px;
-  background: rgb(64 121 242);
-}
-
-</style>
diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue
index 32a12e5..e13f811 100644
--- a/src/views/dataView/components/alarmView.vue
+++ b/src/views/dataView/components/alarmView.vue
@@ -1,3 +1,4 @@
+<!--报警分析-->
 <template>
   <panel-card title="报警分析">
     <template slot="func">
@@ -11,7 +12,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          @change="fetchDeviceTypeBar"
+          @change="refresh"
         />
       </el-col>
     </template>
@@ -65,11 +66,14 @@
   },
   created() {
     this.timeRange = getSearchLastWeekTime()
-    this.handleDateTime()
-    this.fetchAlarmByDay()
-    this.fetchAlarmByContent()
+    this.refresh()
   },
   methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchAlarmByDay()
+      this.fetchAlarmByContent()
+    },
     // 获取各类报警的列表
     fetchAlarmByContent() {
       alarmStaticsByContent(this.listQuery).then(response => {
diff --git a/src/views/dataView/components/jobAnalysis.vue b/src/views/dataView/components/jobAnalysis.vue
new file mode 100644
index 0000000..483e652
--- /dev/null
+++ b/src/views/dataView/components/jobAnalysis.vue
@@ -0,0 +1,106 @@
+<!--工单情况-->
+<template>
+  <panel-card title="工单分析">
+    <template slot="func">
+      <el-col :span="16">
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="refresh"
+        />
+      </el-col>
+    </template>
+    <ve-bar
+      :data="chartData"
+      :extend="extend"
+      :settings="chartSettings"
+    />
+  </panel-card>
+</template>
+
+<script>
+import PanelCard from '@/components/BigData/Card/panelCard'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { jobStaticsByDept } from '@/api/data/dataStatics'
+export default {
+  name: 'JobAnalysis',
+  components: { PanelCard },
+  data() {
+    return {
+      listQuery: {
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      timeRange: [], // 时间范围
+      chartSettings: {
+        labelMap: {
+          'deptName': '权属单位',
+          'beforeGet': '待处理',
+          'beforeConfirm': '待确认',
+          'inHandle': '处理中',
+          'over': '已完成'
+        },
+        stack: {
+          'xxx': ['beforeGet', 'beforeConfirm', 'inHandle', 'over']
+        }
+      },
+      extend: {
+        xAxis: {
+          type: 'value',
+          minInterval: 1
+        },
+        series: {
+          barMaxWidth: 35
+        }
+      },
+      chartData: {
+        columns: ['deptName', 'beforeGet', 'beforeConfirm', 'inHandle', 'over'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.timeRange = getSearchLastWeekTime()
+    this.refresh()
+  },
+  mounted() {
+  },
+  methods: {
+    refresh() {
+      this.handleDateTime()
+      this.fetchData()
+    },
+    fetchData() {
+      jobStaticsByDept(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.beforeGet) + parseInt(item.beforeConfirm) + parseInt(item.inHandle) + parseInt(item.over)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 10 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
+      })
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 1acd118..7cae96f 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -29,43 +29,20 @@
 <script>
 import Card from '@/components/BigData/Card'
 import { wellCountByBfzt } from '@/api/well/well'
-import { deviceStaticByStatus, alarmNowStatic } from '@/api/data/dataStatics'
-import { jobCountByStatus } from '@/api/alarm/job'
+import { deviceStaticByStatus, alarmNowStatic, dataCount } from '@/api/data/dataStatics'
 import PanelCard from '@/components/BigData/Card/panelCard'
+import { getDayTime } from '@/utils/dateutils'
 export default {
   name: 'PanelGroup',
   components: { PanelCard, Card },
   data() {
     return {
-      dialogFormVisible: false,
-      listLoading: false,
       columns: [
-        {
-          text: '设备编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '最新记录上传时间',
-          width: '200',
-          value: '',
-          align: 'center'
-        },
-        {
-          text: '离线天数',
-          value: '',
-          align: 'center'
-        }
+        { text: '设备编号', value: '', align: 'center' },
+        { text: '设备类型', value: '', align: 'center' },
+        { text: '点位编号', value: '', align: 'center' },
+        { text: '最新记录上传时间', width: '200', value: '', align: 'center' },
+        { text: '离线天数', value: '', align: 'center' }
       ], // 显示列
       dataGroup: [
         {
@@ -88,25 +65,25 @@
           title: '今日数据',
           context: '--',
           flags: '条',
-          icon: 'icon-alarm',
-          color: '#f4516c',
-          permission: '/alarm/now'
+          icon: 'icon-database',
+          color: '#1ed8f3',
+          permission: '/data'
         },
         {
           title: '离线设备',
           context: '--',
           flags: '个',
-          icon: 'icon-order',
-          color: '#f4516c',
-          permission: '/job/list'
+          icon: 'icon-device',
+          color: '#676767',
+          permission: '/device/list'
         },
         {
           title: '当前报警',
           context: '--',
           flags: '条',
           icon: 'icon-alarm',
-          color: '#40c9c6',
-          permission: '/well/list'
+          color: '#f4516c',
+          permission: '/alarm/now'
         }
       ]
     }
@@ -115,34 +92,36 @@
     this.getWellCount()
     this.getDeviceCount()
     this.getAlarmCount()
-    this.getJobCount()
+    this.getTodayDataCount()
   },
   methods: {
-    goPage(card) {
-      if (card.title === '离线设备') {
-        this.dialogFormVisible = true
-      }
-    },
+    // 获取井数量
     getWellCount() {
       wellCountByBfzt().then(response => {
         this.dataGroup[0].context = response.data.total
       })
     },
+    // 获取设备数量， 离线设备数量
     getDeviceCount() {
       deviceStaticByStatus().then(response => {
         this.dataGroup[1].context = response.data.total
+        this.dataGroup[3].context = response.data.offline
       })
     },
+    // 获取当前报警数量
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[2].context = response.data.total
+        this.dataGroup[4].context = response.data.total
       })
     },
-    getJobCount() {
-      jobCountByStatus().then(response => {
-        const data = response.data
-        const total = data.beforeGet + data.beforeConfirm + data.inHandle
-        this.dataGroup[3].context = total
+    // 获取今日数据总数
+    getTodayDataCount() {
+      const beginTime = getDayTime(new Date().getTime()).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      const params = { beginTime, endTime }
+      dataCount(params).then(response => {
+        debugger
+        this.dataGroup[2].context = response.data.total
       })
     }
   }
diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue
index 82fe878..5c0e2d7 100644
--- a/src/views/dataView/components/wellCountView.vue
+++ b/src/views/dataView/components/wellCountView.vue
@@ -1,61 +1,70 @@
 <template>
-  <div>
-    <div class="flagBoxStyle">
-      <div class="flagStyle" />
-      <div>井数量分析</div>
-    </div>
-    <el-row :gutter="10">
+  <panel-card title="点位分析">
+    <el-row>
       <el-col :span="12">
-        <ve-pie
-          :data="chartDataPie"
-          :extend="extendPie"
-        />
+        <ve-pie :data="pieChartData" :extend="pieExtend" />
       </el-col>
       <el-col :span="12">
-        <ve-bar
-          :data="chartData"
-          :grid="grid"
-          :extend="extend"
-          :settings="chartSettings"
-        />
+        <ve-bar :data="chartData" :grid="grid" :extend="extend" :settings="chartSettings" />
       </el-col>
     </el-row>
+  </panel-card>
+  <!--  <div>-->
+  <!--    <div class="flagBoxStyle">-->
+  <!--      <div class="flagStyle" />-->
+  <!--      <div>井数量分析</div>-->
+  <!--    </div>-->
+    <!--    <el-row :gutter="10">-->
+    <!--      <el-col :span="12">-->
+    <!--        <ve-pie-->
+    <!--          :data="chartDataPie"-->
+    <!--          :extend="extendPie"-->
+    <!--        />-->
+    <!--      </el-col>-->
+    <!--      <el-col :span="12">-->
+    <!--        <ve-bar-->
+    <!--          :data="chartData"-->
+    <!--          :grid="grid"-->
+    <!--          :extend="extend"-->
+    <!--          :settings="chartSettings"-->
+    <!--        />-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
   </div>
 </template>
 
 <script>
-import { deviceStaticsByOnline } from '@/api/data/dataStatics'
+import { deviceStaticsByOnline, wellStaticByBfzt, wellStaticByType } from '@/api/data/dataStatics'
+import PanelCard from '@/components/BigData/Card/panelCard'
 export default {
   name: 'WellCountView',
+  components: { PanelCard },
   data() {
     return {
-      online: 0,
-      offline: 0,
       // 饼状图
-      extendPie: {
+      pieExtend: {
         series: {
           label: { show: true, position: 'outside', formatter: '{b}:{c}' },
           radius: '45%'
         }
       },
-      chartDataPie: {
-        columns: ['onlineStatus', 'deviceCount'],
+      pieChartSettings: {
+        labelMap: {
+          'bfzt': '布防状态',
+          'wellCount': '井数量'
+        },
+        dimension: 'bfzt',
+        metrics: 'wellCount'
+      },
+      pieChartData: {
+        columns: ['bfzt', 'wellCount'],
         rows: []
       },
       // 柱状图
       extend: {
-        xAxis: {
-          axisLabel: {
-            rotate: 30,
-            margin: 30,
-            textStyle: {
-              align: 'center'
-            }
-          }
-        },
         series: {
-          label: { show: true, position: 'top' },
-          barMaxWidth: 35 // 最大柱宽度
+          label: { show: true, position: 'right' },
+          barMaxWidth: 35
         }
       },
       grid: {
@@ -67,42 +76,36 @@
         },
         barWidth: 15,
         labelMap: {
-          'deviceType': '权属单位',
-          'offline': '设备数量（个）'
+          'wellTypeName': '点位类型',
+          'wellCount': '井数量'
         },
-        dimension: ['deviceType'],
-        metrics: ['offline']
+        dimension: ['wellTypeName'],
+        metrics: ['wellCount']
       },
       chartData: {
-        columns: ['deviceType', 'offline'],
+        columns: ['wellTypeName', 'wellCount'],
         rows: []
       }
     }
   },
   created() {
-    this.fetchDeviceType()
+    this.fetchBfcfData()
+    this.fetchWellTypeData()
   },
   methods: {
-    fetchDeviceType() {
-      this.chartDataPie.rows = [
-        { 'onlineStatus': '在线', 'deviceCount': '10' },
-        { 'onlineStatus': '离线', 'deviceCount': '20' }
-      ]
-      this.chartData.rows = [
-        {
-
-        }
-      ]
-      deviceStaticsByOnline().then(response => {
-        response.data.forEach((item) => {
-          this.online += item.online
-          this.offline += item.offline
-        })
+    // 获取统计数据
+    fetchBfcfData() {
+      wellStaticByBfzt(this.listQuery).then(response => {
+        const data = response.data
+        this.pieChartData.rows = [
+          { 'bfzt': '布防', 'wellCount': data.bfWell },
+          { 'bfzt': '撤防', 'wellCount': data.cfWell }
+        ]
+      })
+    },
+    fetchWellTypeData() {
+      wellStaticByType().then(response => {
         this.chartData.rows = response.data
-        // this.chartDataPie.rows = [
-        //   { 'onlineStatus': '在线', 'deviceCount': this.online },
-        //   { 'onlineStatus': '离线', 'deviceCount': this.offline }
-        // ]
       })
     }
   }
diff --git a/src/views/dataView/dataView.vue b/src/views/dataView/dataView.vue
index cc24c1a..a1cc8c5 100644
--- a/src/views/dataView/dataView.vue
+++ b/src/views/dataView/dataView.vue
@@ -12,15 +12,13 @@
         <alarm-view />
       </el-col>
       <el-col :span="12">
-        <alarm-status />
+        <job-analysis />
       </el-col>
     </el-row>
-    <el-col :span="24">
+    <el-row style="margin-top:10px" gutter="10">
       <!-- 井数量分析 -->
       <el-col :span="12">
-        <el-card>
-          <well-count-view />
-        </el-card>
+        <well-count-view />
       </el-col>
       <!-- 设备数量分析 -->
       <el-col :span="12">
@@ -28,21 +26,21 @@
           <device-count-view />
         </el-card>
       </el-col>
-    </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
 import panelGroup from './components/panelGroup'
-import alarmStatus from './components/alarmStatus'
+import alarmStatus from './components/jobAnalysis'
 import wellCountView from './components/wellCountView'
 import deviceCountView from './components/deviceCountView'
 import alarmView from './components/alarmView'
-import PanelCard from '@/components/BigData/Card/panelCard'
+import JobByStatus from '@/views/dashboard/components/JobByStatus'
+import JobAnalysis from '@/views/dataView/components/jobAnalysis'
 export default {
   name: 'DataView',
-  components: { PanelCard, panelGroup, alarmStatus, wellCountView, deviceCountView, alarmView }
+  components: { JobAnalysis, JobByStatus, panelGroup, alarmStatus, wellCountView, deviceCountView, alarmView }
 }
 </script>