diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 07636ea..c077b1a 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -95,7 +95,7 @@
// 车辆作业查询
export function exportCarJobRecords(params) {
return request({
- url: '/sanitation/carJobRecord/export',
+ url: '/sanitation/car/exportJobRecord',
method: 'get',
params
})
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 07636ea..c077b1a 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -95,7 +95,7 @@
// 车辆作业查询
export function exportCarJobRecords(params) {
return request({
- url: '/sanitation/carJobRecord/export',
+ url: '/sanitation/car/exportJobRecord',
method: 'get',
params
})
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 4a62b9a..56084c0 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,8 +165,13 @@
// 按日统计
searchByDay() {
this.listQuery.type = 'day'
- this.listQuery.startTime = this.timeRange[0]
- this.listQuery.endTime = this.timeRange[1]
+ if (this.dateRange.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/api/sanitation/car.js b/src/api/sanitation/car.js
index 07636ea..c077b1a 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -95,7 +95,7 @@
// 车辆作业查询
export function exportCarJobRecords(params) {
return request({
- url: '/sanitation/carJobRecord/export',
+ url: '/sanitation/car/exportJobRecord',
method: 'get',
params
})
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 4a62b9a..56084c0 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,8 +165,13 @@
// 按日统计
searchByDay() {
this.listQuery.type = 'day'
- this.listQuery.startTime = this.timeRange[0]
- this.listQuery.endTime = this.timeRange[1]
+ if (this.dateRange.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/carManage/carList.vue b/src/views/carManage/carList.vue
index 76390db..77d6dc2 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,24 +18,24 @@
-
+
新增
-
- 批量导入
-
+
+
+
+
+
+
+
+
+
+
+
批量导出
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 07636ea..c077b1a 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -95,7 +95,7 @@
// 车辆作业查询
export function exportCarJobRecords(params) {
return request({
- url: '/sanitation/carJobRecord/export',
+ url: '/sanitation/car/exportJobRecord',
method: 'get',
params
})
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 4a62b9a..56084c0 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,8 +165,13 @@
// 按日统计
searchByDay() {
this.listQuery.type = 'day'
- this.listQuery.startTime = this.timeRange[0]
- this.listQuery.endTime = this.timeRange[1]
+ if (this.dateRange.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/carManage/carList.vue b/src/views/carManage/carList.vue
index 76390db..77d6dc2 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,24 +18,24 @@
-
+
新增
-
- 批量导入
-
+
+
+
+
+
+
+
+
+
+
+
批量导出
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index d07dcc3..1f585fd 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -10,10 +10,10 @@
0) {
+ this.listQuery.startTime = this.timeRange[0]
+ this.listQuery.endTime = this.timeRange[1]
+ } else {
+ this.listQuery.startTime = ''
+ this.listQuery.endTime = ''
+ }
getCarJobRecords(this.listQuery).then(response => {
this.list = response.data.rows
this.total = response.data.total
diff --git a/src/api/sanitation/car.js b/src/api/sanitation/car.js
index 07636ea..c077b1a 100644
--- a/src/api/sanitation/car.js
+++ b/src/api/sanitation/car.js
@@ -95,7 +95,7 @@
// 车辆作业查询
export function exportCarJobRecords(params) {
return request({
- url: '/sanitation/carJobRecord/export',
+ url: '/sanitation/car/exportJobRecord',
method: 'get',
params
})
diff --git a/src/views/assessment/cleanAssessment.vue b/src/views/assessment/cleanAssessment.vue
index 4a62b9a..56084c0 100644
--- a/src/views/assessment/cleanAssessment.vue
+++ b/src/views/assessment/cleanAssessment.vue
@@ -165,8 +165,13 @@
// 按日统计
searchByDay() {
this.listQuery.type = 'day'
- this.listQuery.startTime = this.timeRange[0]
- this.listQuery.endTime = this.timeRange[1]
+ if (this.dateRange.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/carManage/carList.vue b/src/views/carManage/carList.vue
index 76390db..77d6dc2 100644
--- a/src/views/carManage/carList.vue
+++ b/src/views/carManage/carList.vue
@@ -18,24 +18,24 @@
-
+
新增
-
- 批量导入
-
+
+
+
+
+
+
+
+
+
+
+
批量导出
diff --git a/src/views/jobRecords/jobRecords.vue b/src/views/jobRecords/jobRecords.vue
index d07dcc3..1f585fd 100644
--- a/src/views/jobRecords/jobRecords.vue
+++ b/src/views/jobRecords/jobRecords.vue
@@ -10,10 +10,10 @@
0) {
+ this.listQuery.startTime = this.timeRange[0]
+ this.listQuery.endTime = this.timeRange[1]
+ } else {
+ this.listQuery.startTime = ''
+ this.listQuery.endTime = ''
+ }
getCarJobRecords(this.listQuery).then(response => {
this.list = response.data.rows
this.total = response.data.total
diff --git a/src/views/staffManage/attendanceList.vue b/src/views/staffManage/attendanceList.vue
index 6eceffb..03d69ed 100644
--- a/src/views/staffManage/attendanceList.vue
+++ b/src/views/staffManage/attendanceList.vue
@@ -127,9 +127,12 @@
methods: {
fetchData() {
this.listLoading = true
- if (this.timeRange.length > 0) {
+ 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 = ''
}
getAttendanceList(this.listQuery).then(response => {
if (response.code === 200) {