diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index cd97321..2b60b8a 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index cd97321..2b60b8a 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index 52c4cef..553e542 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index cd97321..2b60b8a 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index 52c4cef..553e542 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index ee2241c..5850001 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -91,10 +91,10 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
-import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletListPage } from '@/api/sanitation/toilet'
-import { getWastebinListPage } from '@/api/sanitation/wastebin'
-import { getTransferstationListPage } from '@/api/sanitation/transferstation'
+import { getStaffList } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -166,15 +166,10 @@
     },
     // 获取人员列表
     getStaffs() {
-      const params = {
-        offset: 1,
-        limit: 200,
-        sort: '',
-        order: 'desc'
-      }
-      getStaffListPage(params).then(response => {
+      getStaffList().then(response => {
         if (response.code === 200) {
-          this.staffs = response.data.rows.map(item => {
+          this.staffs = response.data.filter(item => item.lng !== '')
+          this.staffs = this.staffs.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -215,15 +210,9 @@
       // 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 => {
+      getToiletList().then(response => {
         if (response.code === 200) {
-          this.toilets = response.data.rows.map(item => {
+          this.toilets = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -242,15 +231,9 @@
       //   { 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 => {
+      getTransferstationList().then(response => {
         if (response.code === 200) {
-          this.transferStations = response.data.rows.map(item => {
+          this.transferStations = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -269,15 +252,9 @@
       //   { 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 => {
+      getWastebinList().then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index cd97321..2b60b8a 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index 52c4cef..553e542 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index ee2241c..5850001 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -91,10 +91,10 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
-import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletListPage } from '@/api/sanitation/toilet'
-import { getWastebinListPage } from '@/api/sanitation/wastebin'
-import { getTransferstationListPage } from '@/api/sanitation/transferstation'
+import { getStaffList } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -166,15 +166,10 @@
     },
     // 获取人员列表
     getStaffs() {
-      const params = {
-        offset: 1,
-        limit: 200,
-        sort: '',
-        order: 'desc'
-      }
-      getStaffListPage(params).then(response => {
+      getStaffList().then(response => {
         if (response.code === 200) {
-          this.staffs = response.data.rows.map(item => {
+          this.staffs = response.data.filter(item => item.lng !== '')
+          this.staffs = this.staffs.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -215,15 +210,9 @@
       // 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 => {
+      getToiletList().then(response => {
         if (response.code === 200) {
-          this.toilets = response.data.rows.map(item => {
+          this.toilets = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -242,15 +231,9 @@
       //   { 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 => {
+      getTransferstationList().then(response => {
         if (response.code === 200) {
-          this.transferStations = response.data.rows.map(item => {
+          this.transferStations = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -269,15 +252,9 @@
       //   { 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 => {
+      getWastebinList().then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 1e4af18..3d3bbf5 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -124,7 +124,7 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
-      if (this.dateRange.length > 0) {
+      if (this.dateRange && this.dateRange.length > 0) {
         this.listQuery.startTime = this.dateRange[0]
         this.listQuery.endTime = this.dateRange[1]
       } else {

diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 56084c0..b75a95e 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,7 +165,7 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      if (this.dateRange.length > 0) {
+      if (this.timeRange && this.timeRange.length > 0) {
         this.listQuery.startTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/assessment/staffAssessment.vue b/src/views/assessment/staffAssessment.vue
index d514424..1d9f28d 100644
--- a/src/views/assessment/staffAssessment.vue
+++ b/src/views/assessment/staffAssessment.vue
@@ -180,8 +180,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/toiletAssessment.vue b/src/views/assessment/toiletAssessment.vue
index cd97321..2b60b8a 100644
--- a/src/views/assessment/toiletAssessment.vue
+++ b/src/views/assessment/toiletAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/assessment/wasteAssessment.vue b/src/views/assessment/wasteAssessment.vue
index 52c4cef..553e542 100644
--- a/src/views/assessment/wasteAssessment.vue
+++ b/src/views/assessment/wasteAssessment.vue
@@ -165,8 +165,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/overview/components/mapOverview.vue b/src/views/overview/components/mapOverview.vue
index ee2241c..5850001 100644
--- a/src/views/overview/components/mapOverview.vue
+++ b/src/views/overview/components/mapOverview.vue
@@ -91,10 +91,10 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './popwindow'
-import { getStaffListPage } from '@/api/sanitation/staff'
-import { getToiletListPage } from '@/api/sanitation/toilet'
-import { getWastebinListPage } from '@/api/sanitation/wastebin'
-import { getTransferstationListPage } from '@/api/sanitation/transferstation'
+import { getStaffList } from '@/api/sanitation/staff'
+import { getToiletList } from '@/api/sanitation/toilet'
+import { getWastebinList } from '@/api/sanitation/wastebin'
+import { getTransferstationList } from '@/api/sanitation/transferstation'
 import { getCarList, getCarDetail } from '@/api/sanitation/car'
 
 export default {
@@ -166,15 +166,10 @@
     },
     // 获取人员列表
     getStaffs() {
-      const params = {
-        offset: 1,
-        limit: 200,
-        sort: '',
-        order: 'desc'
-      }
-      getStaffListPage(params).then(response => {
+      getStaffList().then(response => {
         if (response.code === 200) {
-          this.staffs = response.data.rows.map(item => {
+          this.staffs = response.data.filter(item => item.lng !== '')
+          this.staffs = this.staffs.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -215,15 +210,9 @@
       // 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 => {
+      getToiletList().then(response => {
         if (response.code === 200) {
-          this.toilets = response.data.rows.map(item => {
+          this.toilets = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -242,15 +231,9 @@
       //   { 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 => {
+      getTransferstationList().then(response => {
         if (response.code === 200) {
-          this.transferStations = response.data.rows.map(item => {
+          this.transferStations = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
@@ -269,15 +252,9 @@
       //   { 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 => {
+      getWastebinList().then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 1e4af18..3d3bbf5 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -124,7 +124,7 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
-      if (this.dateRange.length > 0) {
+      if (this.dateRange && this.dateRange.length > 0) {
         this.listQuery.startTime = this.dateRange[0]
         this.listQuery.endTime = this.dateRange[1]
       } else {
diff --git a/src/views/transferstationManage/editTransferstation.vue b/src/views/transferstationManage/editTransferstation.vue
index a0f287d..630ee43 100644
--- a/src/views/transferstationManage/editTransferstation.vue
+++ b/src/views/transferstationManage/editTransferstation.vue
@@ -315,6 +315,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },