|
@@ -359,8 +359,17 @@
|
|
|
>
|
|
|
<div slot="header" class="clearfix">
|
|
|
<span style="font-size: 16px; font-weight: bold; float: left"
|
|
|
- >分时数据</span
|
|
|
- >
|
|
|
+ >分时数据</span>
|
|
|
+ <el-select
|
|
|
+ v-model="hourType"
|
|
|
+ placeholder="请选择类型"
|
|
|
+ clearable
|
|
|
+ style="width: 240px; float: right; padding: 3px 0"
|
|
|
+ @change="changeHourType"
|
|
|
+ >
|
|
|
+ <el-option label="销售额" value="1"/>
|
|
|
+ <el-option label="订单数" value="2"/>
|
|
|
+ </el-select>
|
|
|
</div>
|
|
|
<div
|
|
|
id="hourEchart"
|
|
@@ -534,6 +543,7 @@ export default {
|
|
|
return {
|
|
|
hourEchartsLoading: false,
|
|
|
mediaId: 2,
|
|
|
+ hourType: "1",
|
|
|
echartsType: "orderAmount",
|
|
|
echartsTwoType: "validOrderAmount",
|
|
|
// 遮罩层
|
|
@@ -597,6 +607,7 @@ export default {
|
|
|
const end = new Date();
|
|
|
const start = new Date();
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
|
|
|
+ end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
},
|
|
|
},
|
|
@@ -606,6 +617,7 @@ export default {
|
|
|
const end = new Date();
|
|
|
const start = new Date();
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
+ end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
},
|
|
|
},
|
|
@@ -615,6 +627,7 @@ export default {
|
|
|
const end = new Date();
|
|
|
const start = new Date();
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
|
+ end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
},
|
|
|
},
|
|
@@ -624,6 +637,7 @@ export default {
|
|
|
const end = new Date();
|
|
|
const start = new Date();
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
+ end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
},
|
|
|
},
|
|
@@ -707,7 +721,7 @@ export default {
|
|
|
this.hourEchartsLoading = true
|
|
|
getGmvHour(
|
|
|
this.addDateRange({
|
|
|
- userId: this.userId, mediaId: this.mediaId, type: this.type
|
|
|
+ userId: this.userId, mediaId: this.mediaId, type: this.type, hourType: this.hourType
|
|
|
},
|
|
|
this.uploadDate,
|
|
|
"statDate",
|
|
@@ -889,6 +903,12 @@ export default {
|
|
|
this.title = "上传报表";
|
|
|
},
|
|
|
|
|
|
+ changeHourType(e) {
|
|
|
+ this.hourType = e;
|
|
|
+ this.getGmvHour();
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
changeEchartsType(e) {
|
|
|
if (!!e) {
|
|
|
if (e == 'orderAmount') {
|