|
@@ -51,14 +51,27 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
|
|
...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
|
|
async search({ skip = 0, limit = 10, ...info } = {}) {
|
|
async search({ skip = 0, limit = 10, ...info } = {}) {
|
|
- let res = await this.query({ skip, limit, status: '1', type: info.time, start: info.start, end: info.end });
|
|
|
|
|
|
+ let res = await this.query({ skip, limit, status: '1', type: info.time, start: info.start, end: info.end });
|
|
if (this.$checkRes(res)) {
|
|
if (this.$checkRes(res)) {
|
|
let list = res.data.sMarkOrder;
|
|
let list = res.data.sMarkOrder;
|
|
let xAxisList = [];
|
|
let xAxisList = [];
|
|
let seriesList = [];
|
|
let seriesList = [];
|
|
- for (const p1 of list) {
|
|
|
|
- xAxisList.push(p1.date);
|
|
|
|
- seriesList.push(p1.num);
|
|
|
|
|
|
+ if (info.time == 'yearMonth') {
|
|
|
|
+ for (let i = 1; i <= 12; i++) {
|
|
|
|
+ let str = i;
|
|
|
|
+ if (i < 10) str = `0${i}`;
|
|
|
|
+ str = `-${str}-`;
|
|
|
|
+ const l = list.filter((f) => f.date.includes(str));
|
|
|
|
+ const month = `${i}月`;
|
|
|
|
+ const num = l.reduce((p, n) => p + n.money, 0);
|
|
|
|
+ xAxisList.push(month);
|
|
|
|
+ seriesList.push(num);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ for (const p1 of list) {
|
|
|
|
+ xAxisList.push(p1.date);
|
|
|
|
+ seriesList.push(p1.money);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
this.$set(this, 'xAxisList', xAxisList);
|
|
this.$set(this, 'xAxisList', xAxisList);
|
|
this.$set(this, 'seriesList', seriesList);
|
|
this.$set(this, 'seriesList', seriesList);
|