开始时间:
-
@@ -253,6 +247,8 @@ export default {
departId: "",
startTime: "",
endTime: "",
+ showStart: false,
+ showEnd: false,
resX: [],
resY: [],
res2Y: [],
@@ -286,6 +282,8 @@ export default {
if (index == 3) {
this.timeSelect = index;
this.customShow = true;
+ this.showStart = false;
+ this.showEnd = false;
} else {
this.timeSelect = index;
}
@@ -302,17 +300,24 @@ export default {
this.departId = "";
},
- selectConfirm() {
- if (this.timeSelect == 3) {
- this.timeType = this.timeSelect;
- this.startTime = this.start;
- this.endTime = this.end;
- this.getBrokenDate();
- } else {
- this.timeType = this.timeSelect;
- this.getBrokenDate();
- }
- this.filterShow = false;
+ // selectConfirm() {
+ // if (this.timeSelect == 3) {
+ // this.timeType = this.timeSelect;
+ // this.startTime = this.start;
+ // this.endTime = this.end;
+ // this.getBrokenDate();
+ // } else {
+ // this.timeType = this.timeSelect;
+ // this.getBrokenDate();
+ // }
+ // this.filterShow = false;
+ // },
+
+ confirmStart(val) {
+ this.startTime = val.year + '-' + val.month + '-' + val.day
+ },
+ confirmEnd(val) {
+ this.endTime = val.year + '-' + val.month + '-' + val.day
},
handleTime() {
@@ -826,6 +831,7 @@ export default {
.customPop {
padding: 80px 32px 20px 32px;
box-sizing: border-box;
+ height: 600px;
.startTime,
.endTime {
@@ -841,6 +847,7 @@ export default {
text-align: center;
border-radius: 16px;
color: #fff;
+ margin-top: 164px;
}
}
}
diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
index 00397e5a..a02149e2 100644
--- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
+++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
@@ -80,7 +80,6 @@ export default {
}
}
})
- console.log(this.selected);
}
});
},