From c24a5a2a99515b365ebc343b04538bb862790de1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十二月 2023 11:44:22 +0800
Subject: [PATCH] Merge branch 'feature-code-refactoring' and 'feature-002'
---
src/sfc/TimeShortCuts.vue | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 deletions(-)
diff --git a/src/sfc/TimeShortCuts.vue b/src/sfc/TimeShortCuts.vue
index d793bce..6790532 100644
--- a/src/sfc/TimeShortCuts.vue
+++ b/src/sfc/TimeShortCuts.vue
@@ -14,12 +14,15 @@
},
***
-->
+
+
<script>
import dayjs from 'dayjs';
+import time from '@/utils/time.js'
export default {
props: {
beginAndEndTime:{
- type:Object,
+ type:Array,
default: ()=>{
return []
}
@@ -27,6 +30,11 @@
timeType: {
type: String,
default: 'month'
+ },
+ // 鏄惁璁剧疆鍙灞炴��
+ readOnly: {
+ type: Boolean,
+ default:false
}
},
emits: ['submitTime'],
@@ -56,34 +64,89 @@
},
methods: {
initShortCuts() {
+ // this.shortcuts = [
+ // {
+ // text: '鍓嶄竴鏃�',
+ // value: () => {
+ // const start = dayjs().subtract(1,'day').format('YYYY-MM-DD 00:00:00')
+ // const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59')
+ // return [start, end];
+ // }
+ // },
+
+ // {
+ // text: '鍓�7澶�',
+ // value: () => {
+ // const start = dayjs().subtract(7,'day').format('YYYY-MM-DD 00:00:00');
+ // const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59');
+ // return [start, end];
+ // }
+ // },
+ // {
+ // text: '涓婁竴鏈�',
+ // value: () => {
+ // const start = dayjs().subtract(1,'month').startOf('month').format('YYYY-MM-DD HH:mm:ss');
+ // const end = dayjs().subtract(1,'month').endOf('month').format('YYYY-MM-DD HH:mm:ss');
+ // return [start, end];
+ // }
+ // }
+ // ];
+
+
this.shortcuts = [
{
text: '鍓嶄竴鏃�',
value: () => {
- const start = dayjs().subtract(1,'day').format('YYYY-MM-DD 00:00:00')
- const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59')
- return [start, end];
+ if (this.time[0]=='2023-06-01 12:00:00' && this.time[1] == '2023-06-20 16:00:00'){
+ const start = dayjs().subtract(1,'day').format('YYYY-MM-DD 00:00:00')
+ const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59')
+ return [start, end];
+ }else{
+ const start = dayjs(this.time[0]).subtract(1,'day').format('YYYY-MM-DD 00:00:00')
+ const end = dayjs(this.time[1]).subtract(1,'day').format('YYYY-MM-DD 23:59:59')
+ return [start, end];
+ }
}
},
{
text: '鍓�7澶�',
value: () => {
- const start = dayjs().subtract(7,'day').format('YYYY-MM-DD 00:00:00');
- const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59');
+ if (this.time[0]=='2023-06-01 12:00:00' && this.time[1] == '2023-06-20 16:00:00'){
+ const start = dayjs().subtract(7,'day').format('YYYY-MM-DD 00:00:00');
+ const end = dayjs().subtract(1,'day').format('YYYY-MM-DD 23:59:59');
return [start, end];
+ }else{
+ const start = dayjs(this.time[0]).subtract(7,'day').format('YYYY-MM-DD 00:00:00')
+ const end = dayjs(this.time[1]).subtract(7,'day').format('YYYY-MM-DD 23:59:59')
+ return [start, end];
+ }
+
}
},
{
text: '涓婁竴鏈�',
value: () => {
- const start = dayjs().subtract(1,'month').startOf('month').format('YYYY-MM-DD HH:mm:ss');
- const end = dayjs().subtract(1,'month').endOf('month').format('YYYY-MM-DD HH:mm:ss');
- return [start, end];
+ if (this.time[0]=='2023-06-01 12:00:00' && this.time[1] == '2023-06-20 16:00:00'){
+ const start = dayjs().subtract(1,'month').startOf('month').format('YYYY-MM-DD HH:mm:ss');
+ const end = dayjs().subtract(1,'month').endOf('month').format('YYYY-MM-DD HH:mm:ss');
+ return [start, end];
+ }else{
+ const start = dayjs(this.time[0]).subtract(1,'month').format('YYYY-MM-DD HH:mm:ss')
+ const end = dayjs(this.time[1]).subtract(1,'month').format('YYYY-MM-DD HH:mm:ss')
+ return [start, end];
+ }
+
}
}
];
+
},
+
+
+
+
+
initOneWeekAgoTime() {
switch (this.timeType) {
case 'day':
@@ -110,12 +173,15 @@
// 闃叉鍦ㄦ瘡鏈堢殑1鍙凤紝鍑虹幇time[0]>time[1]鐨勬儏鍐�
if(this.time[0]<this.time[1]){
break
- }
+ }
default:
this.time[0] = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss');
this.time[1] = dayjs().format('YYYY-MM-DD HH:mm:ss');
}
- }
+ },
+ judgeDateValid(date) {
+ return time.judgeDateValid(date)
+ }
}
};
</script>
@@ -132,10 +198,13 @@
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
value-format="YYYY-MM-DD HH:mm:ss"
+ :disabled-date="judgeDateValid"
@change="$emit('submitTime', time)"
:default-time = "defaultTime"
-
+ :readonly="readOnly"
/>
+
+
</div>
</div>
</template>
@@ -151,7 +220,5 @@
font-size: 14px;
}
-/* .pick-date {
- width: 200px;
-} */
+
</style>
--
Gitblit v1.9.3