|
@@ -5,12 +5,13 @@
|
|
|
:inline="true"
|
|
|
ref="searchForm"
|
|
|
class="searchForm"
|
|
|
+ saveKey="exerciseDuration"
|
|
|
:model.sync="searchForm"
|
|
|
>
|
|
|
<el-form-item prop="dates">
|
|
|
<el-date-picker
|
|
|
@change="changeWeek"
|
|
|
- :closeable="false"
|
|
|
+ :clearable="false"
|
|
|
v-model="searchForm.dates"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
:picker-options="{ firstDayOfWeek: 1 }"
|
|
@@ -177,8 +178,11 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
async mounted() {
|
|
|
- this.searchForm.dates.push(getNowDateAndMonday(nowTime));
|
|
|
- this.searchForm.dates.push(getNowDateAndSunday(nowTime));
|
|
|
+ if (this.searchForm.dates?.length <= 0) {
|
|
|
+ this.searchForm.dates.push(getNowDateAndMonday(nowTime));
|
|
|
+ this.searchForm.dates.push(getNowDateAndSunday(nowTime));
|
|
|
+ }
|
|
|
+
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
@@ -233,12 +237,17 @@ export default {
|
|
|
let lastWeek = dayjs(nowDate)
|
|
|
.subtract(1, "week")
|
|
|
.format("YYYY-MM-DD");
|
|
|
+
|
|
|
+ console.log(lastWeek, nowDate, "121212");
|
|
|
this.searchForm.dates = [
|
|
|
getNowDateAndMonday(lastWeek),
|
|
|
getNowDateAndSunday(nowDate)
|
|
|
];
|
|
|
+
|
|
|
+ console.log(this.searchForm.dates, "this.searchForm.dates");
|
|
|
},
|
|
|
changeWeek(val) {
|
|
|
+ console.log(val, "121212");
|
|
|
if (val) {
|
|
|
this.searchForm.dates = [
|
|
|
getNowDateAndMonday(val[0]),
|
|
@@ -395,10 +404,21 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
formatter: item => {
|
|
|
+ // let arr = [
|
|
|
+ // { name: "会员人数", dot: "元" },
|
|
|
+ // { name: "<=60分钟", dot: "%" },
|
|
|
+ // { name: "60-120分钟", dot: "元" },
|
|
|
+ // { name: "120-240分钟", dot: "元" },
|
|
|
+ // { name: ">240分钟", dot: "元" },
|
|
|
+ // { name: "平均时长", dot: "元" }
|
|
|
+ // ];
|
|
|
+ // console.log(item, "-121212--------------");
|
|
|
return [
|
|
|
item[0].axisValueLabel,
|
|
|
...item.map(d => {
|
|
|
- return `<br/>${d.marker}${d.seriesName}: ${d.value}分钟`;
|
|
|
+ return `<br/>${d.marker}${d.seriesName}: ${d.value}${
|
|
|
+ d.seriesName == "平均时长" ? "分钟" : "人"
|
|
|
+ }`;
|
|
|
})
|
|
|
].join("");
|
|
|
}
|