提交更新

parent 6eb52044
...@@ -876,7 +876,7 @@ ...@@ -876,7 +876,7 @@
this.isOpen = true; this.isOpen = true;
this.flag = 0; this.flag = 0;
this.memberInfo.invalidDateStr = '2022年6月30日'; this.memberInfo.invalidDateStr = '2022年6月30日';
this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day'); this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1;
this.containerHeight = 4200; this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart()); this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex)); this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
...@@ -894,7 +894,7 @@ ...@@ -894,7 +894,7 @@
this.isOpen = true; this.isOpen = true;
this.flag = 0; this.flag = 0;
this.memberInfo.invalidDateStr = '2022年6月30日'; this.memberInfo.invalidDateStr = '2022年6月30日';
this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day'); this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1;
this.containerHeight = 4200; this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart()); this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex)); this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
...@@ -1692,20 +1692,20 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -1692,20 +1692,20 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
// 三对象排序 // 三对象排序
numsort(obj1, obj2, obj3) { numsort(obj1, obj2, obj3) {
var temp; var temp;
if(obj1.num>obj2.num){ if (obj1.num > obj2.num) {
temp=JSON.parse(JSON.stringify(obj1)); temp = JSON.parse(JSON.stringify(obj1));
obj1=JSON.parse(JSON.stringify(obj2)); obj1 = JSON.parse(JSON.stringify(obj2));
obj2.num=JSON.parse(JSON.stringify(temp)); obj2.num = JSON.parse(JSON.stringify(temp));
} }
if(obj2.num>obj3.num){ if (obj2.num > obj3.num) {
temp=JSON.parse(JSON.stringify(obj2)); temp = JSON.parse(JSON.stringify(obj2));
obj2=JSON.parse(JSON.stringify(obj3)); obj2 = JSON.parse(JSON.stringify(obj3));
obj3=JSON.parse(JSON.stringify(temp)); obj3 = JSON.parse(JSON.stringify(temp));
} }
if(obj1.num>obj2.num){ if (obj1.num > obj2.num) {
temp=JSON.parse(JSON.stringify(obj1)); temp = JSON.parse(JSON.stringify(obj1));
obj1=JSON.parse(JSON.stringify(obj2)); obj1 = JSON.parse(JSON.stringify(obj2));
obj2=JSON.parse(JSON.stringify(temp)); obj2 = JSON.parse(JSON.stringify(temp));
} }
return [{ return [{
name: obj1.name, name: obj1.name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment