diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index 7cb320e..fd6cb63 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -32,12 +32,21 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
-  components: { ImageBlock},
+  components: { ImageBlock },
   data() {
     return {
       color: '',
+      commonParams: {
+        type: 'day',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
         value: '3', // 数值
@@ -45,7 +54,7 @@
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '587', // 数值
+        value: '4', // 数值
         unit: '次'
       },
       toiletCleanCount: {
@@ -59,6 +68,34 @@
         unit: '人'
       }
     }
+  },
+  created() {
+    // this.getWasteBinJobCount()
+    // this.fetchCleanJobCount()
+    // this.fetchToiletJobCount()
+  },
+  methods: {
+    getWasteBinJobCount() {
+      getTransferJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.wasteCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchCleanJobCount() {
+      getCleanJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.cleanCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchToiletJobCount() {
+      getToiletJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.toiletCleanCount.value = response.data[0].count
+        }
+      })
+    }
   }
 }
 </script>

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index 7cb320e..fd6cb63 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -32,12 +32,21 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
-  components: { ImageBlock},
+  components: { ImageBlock },
   data() {
     return {
       color: '',
+      commonParams: {
+        type: 'day',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
         value: '3', // 数值
@@ -45,7 +54,7 @@
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '587', // 数值
+        value: '4', // 数值
         unit: '次'
       },
       toiletCleanCount: {
@@ -59,6 +68,34 @@
         unit: '人'
       }
     }
+  },
+  created() {
+    // this.getWasteBinJobCount()
+    // this.fetchCleanJobCount()
+    // this.fetchToiletJobCount()
+  },
+  methods: {
+    getWasteBinJobCount() {
+      getTransferJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.wasteCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchCleanJobCount() {
+      getCleanJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.cleanCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchToiletJobCount() {
+      getToiletJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.toiletCleanCount.value = response.data[0].count
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 3915aff..32a0cba 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,7 +14,7 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
           <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
@@ -23,21 +23,21 @@
       <!--设施显示-->
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
-          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
+          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
+          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
             <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
-          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
+          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng" @click="openPopup($event,'toilet',toilet)">
             <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
@@ -46,7 +46,7 @@
       </div>
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
-        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
+        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng" @click="openPopup($event,'car',car)">
           <l-popup>
             <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
@@ -92,9 +92,9 @@
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
 import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletList } from '@/api/sanitation/toilet'
-import { getWastebinList } from '@/api/sanitation/wastebin'
-import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getToiletListPage } from '@/api/sanitation/toilet'
+import { getWastebinListPage } from '@/api/sanitation/wastebin'
+import { getTransferstationListPage } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -103,43 +103,42 @@
   data() {
     return {
       type: 'staff', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员
-      wastebins: [], // 垃圾桶
-      transferStations: [], // 垃圾中转站
+      staffs: [], // 人员列表
+      wastebins: [], // 垃圾桶列表
+      transferStations: [], // 垃圾中转站列表
       toilets: [], // 公厕
       cars: [], // 车辆
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 人员图标
       toiletIcon: L.icon({
         iconUrl: require('../../../assets/overview/toilet3d.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 转运站图标
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
-      staffShow: true,
-      wastebinShow: true,
-      transferStationShow: true,
-      toiletShow: true,
-      carShow: true,
-      currentData: null,
-      currentType: 'staff'
+      }), // 车辆图标
+      staffShow: true, // 人员是否显示
+      wastebinShow: true, // 垃圾桶是否显示
+      transferStationShow: true, // 转运站是否显示
+      toiletShow: true, // 公厕是否显示
+      carShow: true, // 车辆是否显示
+      currentData: null // 当前弹窗数据
     }
   },
   created() {
@@ -167,13 +166,6 @@
     },
     // 获取人员列表
     getStaffs() {
-      // this.staffs = [
-      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      // ]
       const params = {
         offset: 1,
         limit: 200,
@@ -184,20 +176,83 @@
         if (response.code === 200) {
           this.staffs = response.data.rows.map(item => {
             return {
-              id: item.id,
-              name: item.name,
-              sexName: item.sexName,
-              idcard: item.idCard,
-              tel: item.tel,
-              type: item.type,
-              typeName: item.type,
-              post: item.post,
-              postName: item.postName,
-              jobs: item.jobs,
-              responseArea: item.responseArea,
-              responseAreaName: item.responseAreaName,
-              lat: parseFloat(item.lat),
-              lng: parseFloat(item.lng),
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'staff':
+          await this.fetchStaffDetail(data)
+          break
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'toilet':
+          await this.fetchToiletDetail(data)
+          break
+        case 'transferStation':
+          await this.fetchTransferStationDetail(data)
+          break
+        case 'car':
+          await this.fetchCarDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 获取人员详情
+    fetchStaffDetail(staff) {
+      this.currentData = staff
+    },
+    // 获取公厕列表
+    getToilets() {
+      // this.toilets = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getToiletListPage(params).then(response => {
+        if (response.code === 200) {
+          this.toilets = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 获取公厕详情
+    fetchToiletDetail(data) {
+      this.currentData = data
+    },
+    // 获取转运站列表
+    getTransferStation() {
+      // this.transferStations = [
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getTransferstationListPage(params).then(response => {
+        if (response.code === 200) {
+          this.transferStations = response.data.rows.map(item => {
+            return {
+              ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
@@ -205,88 +260,35 @@
       })
     },
     // 获取人员详情
-    fetchStaffDetail(event, staff) {
-      this.currentData = staff
-      // setTimeout(() => {
-      //   this.$nextTick(() => {
-      //     // event.target.openPopup()
-      //     this.$emit('marker-click')
-      //   })
-      //   // this.$emit('marker-click')
-      // }, 3000)
-
-      // this.currentData = {
-      //   id: '12345',
-      //   name: '张三',
-      //   sexName: '男',
-      //   idcard: '130827098484123',
-      //   tel: '13382739123',
-      //   type: '0',
-      //   typeName: '普通职工',
-      //   post: '1',
-      //   postName: '保洁员',
-      //   jobs: '0;1',
-      //   responseArea: '崇仁县',
-      //   responseAreaName: '崇仁县'
-      // }
-    },
-    // 获取公厕列表
-    getToilets() {
-      this.toilets = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取公厕详情
-    fetchToiletDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号公厕',
-        position: '马路上',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
-    },
-    // 获取转运站列表
-    getTransferStation() {
-      this.transferStations = [
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取人员详情
-    fetchTransferStationDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号中转站',
-        position: '小区里',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
+    fetchTransferStationDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getWastebins() {
-      this.wastebins = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.wastebins = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getWastebinListPage(params).then(response => {
+        if (response.code === 200) {
+          this.wastebins = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    fetchWastebinDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号垃圾桶',
-        position: '小区里',
-        responsiblePerson: '张三',
-        ts: '2020-01'
-      }
+    fetchWastebinDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getCars() {
@@ -319,21 +321,12 @@
       })
     },
     // 获取人员详情
-    fetchCarDetail(carId) {
-      getCarDetail(carId).then(response => {
+    fetchCarDetail(car) {
+      getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
         }
       })
-      // this.currentData = {
-      //   id: '12345',
-      //   carCode: '赣F25445S',
-      //   name: '环卫车',
-      //   carTypeName: '高级车',
-      //   brandModel: '奥迪',
-      //   deptName: '环卫所',
-      //   chargePerson: '张三'
-      // }
     }
 
   }

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index 7cb320e..fd6cb63 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -32,12 +32,21 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
-  components: { ImageBlock},
+  components: { ImageBlock },
   data() {
     return {
       color: '',
+      commonParams: {
+        type: 'day',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
         value: '3', // 数值
@@ -45,7 +54,7 @@
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '587', // 数值
+        value: '4', // 数值
         unit: '次'
       },
       toiletCleanCount: {
@@ -59,6 +68,34 @@
         unit: '人'
       }
     }
+  },
+  created() {
+    // this.getWasteBinJobCount()
+    // this.fetchCleanJobCount()
+    // this.fetchToiletJobCount()
+  },
+  methods: {
+    getWasteBinJobCount() {
+      getTransferJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.wasteCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchCleanJobCount() {
+      getCleanJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.cleanCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchToiletJobCount() {
+      getToiletJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.toiletCleanCount.value = response.data[0].count
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 3915aff..32a0cba 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,7 +14,7 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
           <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
@@ -23,21 +23,21 @@
       <!--设施显示-->
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
-          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
+          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
+          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
             <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
-          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
+          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng" @click="openPopup($event,'toilet',toilet)">
             <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
@@ -46,7 +46,7 @@
       </div>
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
-        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
+        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng" @click="openPopup($event,'car',car)">
           <l-popup>
             <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
@@ -92,9 +92,9 @@
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
 import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletList } from '@/api/sanitation/toilet'
-import { getWastebinList } from '@/api/sanitation/wastebin'
-import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getToiletListPage } from '@/api/sanitation/toilet'
+import { getWastebinListPage } from '@/api/sanitation/wastebin'
+import { getTransferstationListPage } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -103,43 +103,42 @@
   data() {
     return {
       type: 'staff', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员
-      wastebins: [], // 垃圾桶
-      transferStations: [], // 垃圾中转站
+      staffs: [], // 人员列表
+      wastebins: [], // 垃圾桶列表
+      transferStations: [], // 垃圾中转站列表
       toilets: [], // 公厕
       cars: [], // 车辆
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 人员图标
       toiletIcon: L.icon({
         iconUrl: require('../../../assets/overview/toilet3d.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 转运站图标
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
-      staffShow: true,
-      wastebinShow: true,
-      transferStationShow: true,
-      toiletShow: true,
-      carShow: true,
-      currentData: null,
-      currentType: 'staff'
+      }), // 车辆图标
+      staffShow: true, // 人员是否显示
+      wastebinShow: true, // 垃圾桶是否显示
+      transferStationShow: true, // 转运站是否显示
+      toiletShow: true, // 公厕是否显示
+      carShow: true, // 车辆是否显示
+      currentData: null // 当前弹窗数据
     }
   },
   created() {
@@ -167,13 +166,6 @@
     },
     // 获取人员列表
     getStaffs() {
-      // this.staffs = [
-      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      // ]
       const params = {
         offset: 1,
         limit: 200,
@@ -184,20 +176,83 @@
         if (response.code === 200) {
           this.staffs = response.data.rows.map(item => {
             return {
-              id: item.id,
-              name: item.name,
-              sexName: item.sexName,
-              idcard: item.idCard,
-              tel: item.tel,
-              type: item.type,
-              typeName: item.type,
-              post: item.post,
-              postName: item.postName,
-              jobs: item.jobs,
-              responseArea: item.responseArea,
-              responseAreaName: item.responseAreaName,
-              lat: parseFloat(item.lat),
-              lng: parseFloat(item.lng),
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'staff':
+          await this.fetchStaffDetail(data)
+          break
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'toilet':
+          await this.fetchToiletDetail(data)
+          break
+        case 'transferStation':
+          await this.fetchTransferStationDetail(data)
+          break
+        case 'car':
+          await this.fetchCarDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 获取人员详情
+    fetchStaffDetail(staff) {
+      this.currentData = staff
+    },
+    // 获取公厕列表
+    getToilets() {
+      // this.toilets = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getToiletListPage(params).then(response => {
+        if (response.code === 200) {
+          this.toilets = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 获取公厕详情
+    fetchToiletDetail(data) {
+      this.currentData = data
+    },
+    // 获取转运站列表
+    getTransferStation() {
+      // this.transferStations = [
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getTransferstationListPage(params).then(response => {
+        if (response.code === 200) {
+          this.transferStations = response.data.rows.map(item => {
+            return {
+              ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
@@ -205,88 +260,35 @@
       })
     },
     // 获取人员详情
-    fetchStaffDetail(event, staff) {
-      this.currentData = staff
-      // setTimeout(() => {
-      //   this.$nextTick(() => {
-      //     // event.target.openPopup()
-      //     this.$emit('marker-click')
-      //   })
-      //   // this.$emit('marker-click')
-      // }, 3000)
-
-      // this.currentData = {
-      //   id: '12345',
-      //   name: '张三',
-      //   sexName: '男',
-      //   idcard: '130827098484123',
-      //   tel: '13382739123',
-      //   type: '0',
-      //   typeName: '普通职工',
-      //   post: '1',
-      //   postName: '保洁员',
-      //   jobs: '0;1',
-      //   responseArea: '崇仁县',
-      //   responseAreaName: '崇仁县'
-      // }
-    },
-    // 获取公厕列表
-    getToilets() {
-      this.toilets = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取公厕详情
-    fetchToiletDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号公厕',
-        position: '马路上',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
-    },
-    // 获取转运站列表
-    getTransferStation() {
-      this.transferStations = [
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取人员详情
-    fetchTransferStationDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号中转站',
-        position: '小区里',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
+    fetchTransferStationDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getWastebins() {
-      this.wastebins = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.wastebins = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getWastebinListPage(params).then(response => {
+        if (response.code === 200) {
+          this.wastebins = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    fetchWastebinDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号垃圾桶',
-        position: '小区里',
-        responsiblePerson: '张三',
-        ts: '2020-01'
-      }
+    fetchWastebinDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getCars() {
@@ -319,21 +321,12 @@
       })
     },
     // 获取人员详情
-    fetchCarDetail(carId) {
-      getCarDetail(carId).then(response => {
+    fetchCarDetail(car) {
+      getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
         }
       })
-      // this.currentData = {
-      //   id: '12345',
-      //   carCode: '赣F25445S',
-      //   name: '环卫车',
-      //   carTypeName: '高级车',
-      //   brandModel: '奥迪',
-      //   deptName: '环卫所',
-      //   chargePerson: '张三'
-      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 18767ae..8c615c4 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -40,7 +40,7 @@
       <div>建设单位：{{ data.owner }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
       <div>占地面积：{{ data.area }}平方米</div>
-      <div>最新垃圾量：{{ data.capacity }}立方米</div>
+      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index 7cb320e..fd6cb63 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -32,12 +32,21 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
-  components: { ImageBlock},
+  components: { ImageBlock },
   data() {
     return {
       color: '',
+      commonParams: {
+        type: 'day',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
         value: '3', // 数值
@@ -45,7 +54,7 @@
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '587', // 数值
+        value: '4', // 数值
         unit: '次'
       },
       toiletCleanCount: {
@@ -59,6 +68,34 @@
         unit: '人'
       }
     }
+  },
+  created() {
+    // this.getWasteBinJobCount()
+    // this.fetchCleanJobCount()
+    // this.fetchToiletJobCount()
+  },
+  methods: {
+    getWasteBinJobCount() {
+      getTransferJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.wasteCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchCleanJobCount() {
+      getCleanJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.cleanCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchToiletJobCount() {
+      getToiletJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.toiletCleanCount.value = response.data[0].count
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 3915aff..32a0cba 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,7 +14,7 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
           <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
@@ -23,21 +23,21 @@
       <!--设施显示-->
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
-          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
+          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
+          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
             <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
-          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
+          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng" @click="openPopup($event,'toilet',toilet)">
             <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
@@ -46,7 +46,7 @@
       </div>
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
-        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
+        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng" @click="openPopup($event,'car',car)">
           <l-popup>
             <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
@@ -92,9 +92,9 @@
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
 import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletList } from '@/api/sanitation/toilet'
-import { getWastebinList } from '@/api/sanitation/wastebin'
-import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getToiletListPage } from '@/api/sanitation/toilet'
+import { getWastebinListPage } from '@/api/sanitation/wastebin'
+import { getTransferstationListPage } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -103,43 +103,42 @@
   data() {
     return {
       type: 'staff', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员
-      wastebins: [], // 垃圾桶
-      transferStations: [], // 垃圾中转站
+      staffs: [], // 人员列表
+      wastebins: [], // 垃圾桶列表
+      transferStations: [], // 垃圾中转站列表
       toilets: [], // 公厕
       cars: [], // 车辆
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 人员图标
       toiletIcon: L.icon({
         iconUrl: require('../../../assets/overview/toilet3d.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 转运站图标
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
-      staffShow: true,
-      wastebinShow: true,
-      transferStationShow: true,
-      toiletShow: true,
-      carShow: true,
-      currentData: null,
-      currentType: 'staff'
+      }), // 车辆图标
+      staffShow: true, // 人员是否显示
+      wastebinShow: true, // 垃圾桶是否显示
+      transferStationShow: true, // 转运站是否显示
+      toiletShow: true, // 公厕是否显示
+      carShow: true, // 车辆是否显示
+      currentData: null // 当前弹窗数据
     }
   },
   created() {
@@ -167,13 +166,6 @@
     },
     // 获取人员列表
     getStaffs() {
-      // this.staffs = [
-      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      // ]
       const params = {
         offset: 1,
         limit: 200,
@@ -184,20 +176,83 @@
         if (response.code === 200) {
           this.staffs = response.data.rows.map(item => {
             return {
-              id: item.id,
-              name: item.name,
-              sexName: item.sexName,
-              idcard: item.idCard,
-              tel: item.tel,
-              type: item.type,
-              typeName: item.type,
-              post: item.post,
-              postName: item.postName,
-              jobs: item.jobs,
-              responseArea: item.responseArea,
-              responseAreaName: item.responseAreaName,
-              lat: parseFloat(item.lat),
-              lng: parseFloat(item.lng),
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'staff':
+          await this.fetchStaffDetail(data)
+          break
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'toilet':
+          await this.fetchToiletDetail(data)
+          break
+        case 'transferStation':
+          await this.fetchTransferStationDetail(data)
+          break
+        case 'car':
+          await this.fetchCarDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 获取人员详情
+    fetchStaffDetail(staff) {
+      this.currentData = staff
+    },
+    // 获取公厕列表
+    getToilets() {
+      // this.toilets = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getToiletListPage(params).then(response => {
+        if (response.code === 200) {
+          this.toilets = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 获取公厕详情
+    fetchToiletDetail(data) {
+      this.currentData = data
+    },
+    // 获取转运站列表
+    getTransferStation() {
+      // this.transferStations = [
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getTransferstationListPage(params).then(response => {
+        if (response.code === 200) {
+          this.transferStations = response.data.rows.map(item => {
+            return {
+              ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
@@ -205,88 +260,35 @@
       })
     },
     // 获取人员详情
-    fetchStaffDetail(event, staff) {
-      this.currentData = staff
-      // setTimeout(() => {
-      //   this.$nextTick(() => {
-      //     // event.target.openPopup()
-      //     this.$emit('marker-click')
-      //   })
-      //   // this.$emit('marker-click')
-      // }, 3000)
-
-      // this.currentData = {
-      //   id: '12345',
-      //   name: '张三',
-      //   sexName: '男',
-      //   idcard: '130827098484123',
-      //   tel: '13382739123',
-      //   type: '0',
-      //   typeName: '普通职工',
-      //   post: '1',
-      //   postName: '保洁员',
-      //   jobs: '0;1',
-      //   responseArea: '崇仁县',
-      //   responseAreaName: '崇仁县'
-      // }
-    },
-    // 获取公厕列表
-    getToilets() {
-      this.toilets = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取公厕详情
-    fetchToiletDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号公厕',
-        position: '马路上',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
-    },
-    // 获取转运站列表
-    getTransferStation() {
-      this.transferStations = [
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取人员详情
-    fetchTransferStationDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号中转站',
-        position: '小区里',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
+    fetchTransferStationDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getWastebins() {
-      this.wastebins = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.wastebins = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getWastebinListPage(params).then(response => {
+        if (response.code === 200) {
+          this.wastebins = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    fetchWastebinDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号垃圾桶',
-        position: '小区里',
-        responsiblePerson: '张三',
-        ts: '2020-01'
-      }
+    fetchWastebinDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getCars() {
@@ -319,21 +321,12 @@
       })
     },
     // 获取人员详情
-    fetchCarDetail(carId) {
-      getCarDetail(carId).then(response => {
+    fetchCarDetail(car) {
+      getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
         }
       })
-      // this.currentData = {
-      //   id: '12345',
-      //   carCode: '赣F25445S',
-      //   name: '环卫车',
-      //   carTypeName: '高级车',
-      //   brandModel: '奥迪',
-      //   deptName: '环卫所',
-      //   chargePerson: '张三'
-      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 18767ae..8c615c4 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -40,7 +40,7 @@
       <div>建设单位：{{ data.owner }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
       <div>占地面积：{{ data.area }}平方米</div>
-      <div>最新垃圾量：{{ data.capacity }}立方米</div>
+      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index bb0c38c..70e4634 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -10,10 +10,20 @@
 </template>
 
 <script>
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'WasteTransfer',
   data() {
     return {
+      type: 'waste', // waste,clean,toilet
+      listQuery: {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getLastWeek('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }, // 筛选条件
       grid: {
         right: 20,
         bottom: 0,
@@ -46,6 +56,53 @@
         ]
       }
     }
+  },
+  created(){
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      if (this.type === 'clean') {
+        this.fetchCleanData()
+      } else if (this.type === 'waste') {
+        this.fetchWasteData()
+      } else {
+        this.fetchToiletData()
+      }
+    },
+    fetchCleanData() {
+      getCleanJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    },
+    fetchWasteData() {
+      getTransferJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    },
+    fetchToiletData() {
+      getToiletJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    }
   }
 }
 </script>

diff --git a/src/views/overview/components/deviceStatistic.vue b/src/views/overview/components/deviceStatistic.vue
index 507e7d2..7f08699 100644
--- a/src/views/overview/components/deviceStatistic.vue
+++ b/src/views/overview/components/deviceStatistic.vue
@@ -32,6 +32,7 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getSingleCount } from '@/api/sanitation/statistics'
 export default {
   name: 'DeviceStatistic',
   components: { ImageBlock },
@@ -59,6 +60,34 @@
         unit: '辆'
       }
     }
+  },
+  created() {
+    this.getToiletCount()
+    this.getWasteBinCount()
+    this.getTransferStationCount()
+    this.getCarCount()
+  },
+  methods: {
+    getToiletCount() {
+      getSingleCount('toilet').then(response => {
+        this.toiletCount.value = response.data
+      })
+    },
+    getWasteBinCount() {
+      getSingleCount('wastebin').then(response => {
+        this.wastebinCount.value = response.data
+      })
+    },
+    getTransferStationCount() {
+      getSingleCount('transferstation').then(response => {
+        this.transferCount.value = response.data
+      })
+    },
+    getCarCount() {
+      getSingleCount('car').then(response => {
+        this.car.value = response.data
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/head2.vue b/src/views/overview/components/head2.vue
index 7caa7a3..f085b3e 100644
--- a/src/views/overview/components/head2.vue
+++ b/src/views/overview/components/head2.vue
@@ -4,7 +4,7 @@
     <div class="topContainer">
       <div class="topBox">
         <div class="topCenter">
-          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"></i>
+          <i class="el-icon-s-home back-button" title="返回系统" @click="backtoMain"/>
           <!--中间-->
           <div class="topTitle">
             <!--<img :src="require(`@/assets/overview/top-titleBg.png`)">-->
@@ -30,8 +30,8 @@
   },
   mounted() {
   },
-  methods:{
-    backtoMain(){
+  methods: {
+    backtoMain() {
       this.$router.go(-1)
     }
   }
diff --git a/src/views/overview/components/jobStatistic.vue b/src/views/overview/components/jobStatistic.vue
index 7cb320e..fd6cb63 100644
--- a/src/views/overview/components/jobStatistic.vue
+++ b/src/views/overview/components/jobStatistic.vue
@@ -32,12 +32,21 @@
 
 <script>
 import ImageBlock from '@/components/BigData/Block/imageBlock'
+import { getToday } from '@/utils/dateutils'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getCleanJobCount } from '@/api/sanitation/statistics'
 export default {
   name: 'JobStatistic',
-  components: { ImageBlock},
+  components: { ImageBlock },
   data() {
     return {
       color: '',
+      commonParams: {
+        type: 'day',
+        startTime: getToday('yyyy-MM-dd'),
+        endTime: getToday('yyyy-MM-dd')
+      },
       wasteCount: {
         name: '垃圾转运作业次数', // 标题
         value: '3', // 数值
@@ -45,7 +54,7 @@
       },
       cleanCount: {
         name: '路面清扫作业次数', // 标题
-        value: '587', // 数值
+        value: '4', // 数值
         unit: '次'
       },
       toiletCleanCount: {
@@ -59,6 +68,34 @@
         unit: '人'
       }
     }
+  },
+  created() {
+    // this.getWasteBinJobCount()
+    // this.fetchCleanJobCount()
+    // this.fetchToiletJobCount()
+  },
+  methods: {
+    getWasteBinJobCount() {
+      getTransferJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.wasteCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchCleanJobCount() {
+      getCleanJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.cleanCount.value = response.data[0].count
+        }
+      })
+    },
+    fetchToiletJobCount() {
+      getToiletJobCount(this.commonParams).then(response => {
+        if (response.data.length > 0) {
+          this.toiletCleanCount.value = response.data[0].count
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index 3915aff..32a0cba 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -14,7 +14,7 @@
     <map-view>
       <!--人员显示-->
       <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="fetchStaffDetail($event,staff)">
+        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
           <l-popup>
             <popwindow :data="currentData" type="staff"/>
           </l-popup>
@@ -23,21 +23,21 @@
       <!--设施显示-->
       <div v-if="type=='device'">
         <div v-if="wastebinShow">
-          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng">
+          <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
               <popwindow :data="currentData" type="wastebin"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng">
+          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
             <l-popup @ready="fetchTransferStationDetail">
               <popwindow :data="currentData" type="transferStation"/>
             </l-popup>
           </l-marker>
         </div>
         <div v-if="toiletShow">
-          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng">
+          <l-marker v-for="(toilet,index) in toilets" :key="'toilet'+index" :icon="toiletIcon" :lat-lng="toilet.latlng" @click="openPopup($event,'toilet',toilet)">
             <l-popup @ready="fetchToiletDetail">
               <popwindow :data="currentData" type="toilet"/>
             </l-popup>
@@ -46,7 +46,7 @@
       </div>
       <!--车辆显示-->
       <div v-if="type=='car'&&carShow">
-        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng">
+        <l-marker v-for="(car,index) in cars" :key="'car'+index" :icon="carIcon" :lat-lng="car.latlng" @click="openPopup($event,'car',car)">
           <l-popup>
             <popwindow v-if="currentData" :data="car" type="car"/>
           </l-popup>
@@ -92,9 +92,9 @@
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
 import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletList } from '@/api/sanitation/toilet'
-import { getWastebinList } from '@/api/sanitation/wastebin'
-import { getTransferstationList } from '@/api/sanitation/transferstation'
+import { getToiletListPage } from '@/api/sanitation/toilet'
+import { getWastebinListPage } from '@/api/sanitation/wastebin'
+import { getTransferstationListPage } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -103,43 +103,42 @@
   data() {
     return {
       type: 'staff', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员
-      wastebins: [], // 垃圾桶
-      transferStations: [], // 垃圾中转站
+      staffs: [], // 人员列表
+      wastebins: [], // 垃圾桶列表
+      transferStations: [], // 垃圾中转站列表
       toilets: [], // 公厕
       cars: [], // 车辆
       staffIcon: L.icon({
         iconUrl: require('../../../assets/overview/staff-yellow.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 人员图标
       toiletIcon: L.icon({
         iconUrl: require('../../../assets/overview/toilet3d.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 公厕图标
       wastebinIcon: L.icon({
         iconUrl: require('../../../assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
+      }), // 垃圾桶图标
       transferStationIcon: L.icon({
         iconUrl: require('../../../assets/overview/transferstation.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }),
+      }), // 转运站图标
       carIcon: L.icon({
         iconUrl: require('../../../assets/overview/car.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 16]
-      }),
-      staffShow: true,
-      wastebinShow: true,
-      transferStationShow: true,
-      toiletShow: true,
-      carShow: true,
-      currentData: null,
-      currentType: 'staff'
+      }), // 车辆图标
+      staffShow: true, // 人员是否显示
+      wastebinShow: true, // 垃圾桶是否显示
+      transferStationShow: true, // 转运站是否显示
+      toiletShow: true, // 公厕是否显示
+      carShow: true, // 车辆是否显示
+      currentData: null // 当前弹窗数据
     }
   },
   created() {
@@ -167,13 +166,6 @@
     },
     // 获取人员列表
     getStaffs() {
-      // this.staffs = [
-      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      // ]
       const params = {
         offset: 1,
         limit: 200,
@@ -184,20 +176,83 @@
         if (response.code === 200) {
           this.staffs = response.data.rows.map(item => {
             return {
-              id: item.id,
-              name: item.name,
-              sexName: item.sexName,
-              idcard: item.idCard,
-              tel: item.tel,
-              type: item.type,
-              typeName: item.type,
-              post: item.post,
-              postName: item.postName,
-              jobs: item.jobs,
-              responseArea: item.responseArea,
-              responseAreaName: item.responseAreaName,
-              lat: parseFloat(item.lat),
-              lng: parseFloat(item.lng),
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'staff':
+          await this.fetchStaffDetail(data)
+          break
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'toilet':
+          await this.fetchToiletDetail(data)
+          break
+        case 'transferStation':
+          await this.fetchTransferStationDetail(data)
+          break
+        case 'car':
+          await this.fetchCarDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 获取人员详情
+    fetchStaffDetail(staff) {
+      this.currentData = staff
+    },
+    // 获取公厕列表
+    getToilets() {
+      // this.toilets = [
+      //   { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getToiletListPage(params).then(response => {
+        if (response.code === 200) {
+          this.toilets = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
+    },
+    // 获取公厕详情
+    fetchToiletDetail(data) {
+      this.currentData = data
+    },
+    // 获取转运站列表
+    getTransferStation() {
+      // this.transferStations = [
+      //   { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getTransferstationListPage(params).then(response => {
+        if (response.code === 200) {
+          this.transferStations = response.data.rows.map(item => {
+            return {
+              ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
@@ -205,88 +260,35 @@
       })
     },
     // 获取人员详情
-    fetchStaffDetail(event, staff) {
-      this.currentData = staff
-      // setTimeout(() => {
-      //   this.$nextTick(() => {
-      //     // event.target.openPopup()
-      //     this.$emit('marker-click')
-      //   })
-      //   // this.$emit('marker-click')
-      // }, 3000)
-
-      // this.currentData = {
-      //   id: '12345',
-      //   name: '张三',
-      //   sexName: '男',
-      //   idcard: '130827098484123',
-      //   tel: '13382739123',
-      //   type: '0',
-      //   typeName: '普通职工',
-      //   post: '1',
-      //   postName: '保洁员',
-      //   jobs: '0;1',
-      //   responseArea: '崇仁县',
-      //   responseAreaName: '崇仁县'
-      // }
-    },
-    // 获取公厕列表
-    getToilets() {
-      this.toilets = [
-        { id: '12345', name: '张三', latlng: [27.74912, 116.00421], lng: 27.74912, lat: 116.00421, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取公厕详情
-    fetchToiletDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号公厕',
-        position: '马路上',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
-    },
-    // 获取转运站列表
-    getTransferStation() {
-      this.transferStations = [
-        { id: '12348', name: '赵六', latlng: [27.71652, 116.06121], lng: 27.71652, lat: 116.06121, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12349', name: '李现', latlng: [27.70552, 116.09921], lng: 27.70552, lat: 116.09921, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0;1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
-    },
-    // 获取人员详情
-    fetchTransferStationDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号中转站',
-        position: '小区里',
-        owner: '环卫所',
-        responsiblePerson: '张三',
-        responsiblePersonTel: '1302445824585',
-        ts: '2020-01',
-        area: '25',
-        capacity: '845'
-      }
+    fetchTransferStationDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getWastebins() {
-      this.wastebins = [
-        { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
-        { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
-      ]
+      // this.wastebins = [
+      //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
+      //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
+      // ]
+      const params = {
+        offset: 1,
+        limit: 200,
+        sort: '',
+        order: 'desc'
+      }
+      getWastebinListPage(params).then(response => {
+        if (response.code === 200) {
+          this.wastebins = response.data.rows.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+        }
+      })
     },
     // 获取人员详情
-    fetchWastebinDetail() {
-      this.currentData = {
-        code: '12345',
-        name: '1号垃圾桶',
-        position: '小区里',
-        responsiblePerson: '张三',
-        ts: '2020-01'
-      }
+    fetchWastebinDetail(data) {
+      this.currentData = data
     },
     // 获取人员列表
     getCars() {
@@ -319,21 +321,12 @@
       })
     },
     // 获取人员详情
-    fetchCarDetail(carId) {
-      getCarDetail(carId).then(response => {
+    fetchCarDetail(car) {
+      getCarDetail(car.carId).then(response => {
         if (response.code === 200) {
           this.currentData = response.data
         }
       })
-      // this.currentData = {
-      //   id: '12345',
-      //   carCode: '赣F25445S',
-      //   name: '环卫车',
-      //   carTypeName: '高级车',
-      //   brandModel: '奥迪',
-      //   deptName: '环卫所',
-      //   chargePerson: '张三'
-      // }
     }
 
   }
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 18767ae..8c615c4 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -40,7 +40,7 @@
       <div>建设单位：{{ data.owner }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
       <div>占地面积：{{ data.area }}平方米</div>
-      <div>最新垃圾量：{{ data.capacity }}立方米</div>
+      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
       <div>建设时间：{{ data.ts }}</div>
     </div>
     <div v-if="type=='car'" class="info-header">车辆详情</div>
diff --git a/src/views/overview/components/wasteTransfer.vue b/src/views/overview/components/wasteTransfer.vue
index bb0c38c..70e4634 100644
--- a/src/views/overview/components/wasteTransfer.vue
+++ b/src/views/overview/components/wasteTransfer.vue
@@ -10,10 +10,20 @@
 </template>
 
 <script>
+import { getCleanJobCount } from '@/api/sanitation/statistics'
+import { getTransferJobCount } from '@/api/sanitation/statistics'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
 export default {
   name: 'WasteTransfer',
   data() {
     return {
+      type: 'waste', // waste,clean,toilet
+      listQuery: {
+        type: 'day', // 统计方式，day按天，month按月
+        startTime: getLastWeek('yyyy-MM-dd'), // 开始时间
+        endTime: getToday('yyyy-MM-dd') // 结束时间
+      }, // 筛选条件
       grid: {
         right: 20,
         bottom: 0,
@@ -46,6 +56,53 @@
         ]
       }
     }
+  },
+  created(){
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      if (this.type === 'clean') {
+        this.fetchCleanData()
+      } else if (this.type === 'waste') {
+        this.fetchWasteData()
+      } else {
+        this.fetchToiletData()
+      }
+    },
+    fetchCleanData() {
+      getCleanJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    },
+    fetchWasteData() {
+      getTransferJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    },
+    fetchToiletData() {
+      getToiletJobCount(this.listQuery).then(response => {
+        const data = response.data
+        this.chartData.rows = data.map(item => {
+          return {
+            name: item.name.substring(5),
+            value: item.count
+          }
+        })
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 8ee395a..53262d2 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -35,17 +35,17 @@
         <!--右边显示-->
         <div class="left-chart-container" style="flex:1;margin-bottom: 8px;">
           <chart-layout title="垃圾转运作业管理">
-            <waste-transfer/>
+            <waste-transfer type="waste"/>
           </chart-layout>
         </div>
         <div class="left-chart-container" style="flex:1;margin-bottom: 8px;">
           <chart-layout title="路面清扫作业管理">
-            <waste-transfer/>
+            <waste-transfer type="clean"/>
           </chart-layout>
         </div>
         <div class="left-chart-container" style="flex:1">
           <chart-layout title="公厕保洁作业管理">
-            <waste-transfer/>
+            <waste-transfer type="toilet"/>
           </chart-layout>
         </div>
       </div>