Compare commits
5
Commits
prod-26-08-06
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b8e2efbb4 | ||
|
|
f00f1bc1fd | ||
|
|
5c83fa773b | ||
|
|
9990cf74d0 | ||
|
|
fde77b9c0a |
@@ -29,3 +29,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
|
|||||||
```
|
```
|
||||||
code = 104, 接口不提示报错
|
code = 104, 接口不提示报错
|
||||||
```
|
```
|
||||||
|
### 开发分支
|
||||||
|
```
|
||||||
|
dev_2025
|
||||||
|
```
|
||||||
@@ -1054,8 +1054,9 @@ export default {
|
|||||||
this.loading = false
|
this.loading = false
|
||||||
this.detailList?.map(item => {
|
this.detailList?.map(item => {
|
||||||
this.xAxisArr.push(item.month)
|
this.xAxisArr.push(item.month)
|
||||||
|
this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
|
||||||
})
|
})
|
||||||
// console.log(" this.xAxisArr", this.xAxisArr)
|
console.log(" this.xAxisArr", this.xAxisArr)
|
||||||
// this.xAxisArr[this.xAxisArr.length - 1] = '本月'
|
// this.xAxisArr[this.xAxisArr.length - 1] = '本月'
|
||||||
await this.twoTabHanldeData()
|
await this.twoTabHanldeData()
|
||||||
}else if (this.active === 3) {
|
}else if (this.active === 3) {
|
||||||
@@ -1076,6 +1077,7 @@ export default {
|
|||||||
});
|
});
|
||||||
this.labelList = [
|
this.labelList = [
|
||||||
{label: '师傅姓名', prop: 'driverName'},
|
{label: '师傅姓名', prop: 'driverName'},
|
||||||
|
{label: '服务商名称', prop: 'supplierName'},
|
||||||
{label: '案件总量', prop: 'orderCount'},
|
{label: '案件总量', prop: 'orderCount'},
|
||||||
{label: '满意度得分 ', prop: 'driverSatisfaction'},
|
{label: '满意度得分 ', prop: 'driverSatisfaction'},
|
||||||
]
|
]
|
||||||
@@ -1206,13 +1208,18 @@ export default {
|
|||||||
year = new Date(this.current).getFullYear();
|
year = new Date(this.current).getFullYear();
|
||||||
month = new Date(this.current).getMonth() + 1;
|
month = new Date(this.current).getMonth() + 1;
|
||||||
} else {
|
} else {
|
||||||
year = new Date().getFullYear();
|
/*year = new Date().getFullYear();
|
||||||
month = new Date().getMonth() + 1;
|
month = new Date().getMonth() + 1;*/
|
||||||
|
year = 2024
|
||||||
|
month = 12
|
||||||
}
|
}
|
||||||
let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
|
let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
|
||||||
this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
|
this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
|
||||||
this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
|
console.log("this.current",this.current)
|
||||||
this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'
|
/*this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
|
||||||
|
this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'*/
|
||||||
|
this.startTime = '2024-12-01 00:00:00'
|
||||||
|
this.endTime = '2024-12-31 23:59:59'
|
||||||
this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
|
this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
|
||||||
console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
|
console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user