添加了日历跳转

This commit is contained in:
luyuan 2020-10-30 15:54:55 +08:00
parent b38d0f693f
commit 6cf34e698b
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
3 changed files with 11 additions and 8 deletions

View File

@ -47,7 +47,8 @@ export function getdate(yue?: number): GetDate{
const zhou = Math.floor((i + w - 1) / 7) const zhou = Math.floor((i + w - 1) / 7)
const d = { const d = {
day: i, day: i,
list: [] list: [],
time: now.date(i).toISOString()
} }
if(date[zhou] == undefined){ if(date[zhou] == undefined){
date[zhou] = [] date[zhou] = []
@ -63,8 +64,8 @@ export function getdate(yue?: number): GetDate{
} }
export function getweek(zhou?: number){ export function getweek(time: string,zhou?: number){
let now = dayjs() let now = dayjs((!time ? undefined : time))
if(zhou != undefined){ if(zhou != undefined){
now = now.day(now.day() + (zhou * 6)); now = now.day(now.day() + (zhou * 6));
} }

View File

@ -28,7 +28,7 @@
<div class="row" v-for="(item,index) in month.date" :key="index"> <div class="row" v-for="(item,index) in month.date" :key="index">
<div v-for="(i,j) in item" :key="j"> <div v-for="(i,j) in item" :key="j">
<div class="day"> <div class="day">
<div :class="{ing: yue == 0 && month.day == i.day,old: (yue < 0 || (yue == 0 && month.day > i.day)) && i.list.length != 0 ,next: (yue > 0 || (yue == 0 && month.day < i.day)) && i.list.length != 0 }"> <div :class="{ing: yue == 0 && month.day == i.day,old: (yue < 0 || (yue == 0 && month.day > i.day)) && i.list.length != 0 ,next: (yue > 0 || (yue == 0 && month.day < i.day)) && i.list.length != 0 }" @click="navto(i.time)">
{{i.day}} {{i.day}}
<div class="item" v-for="(i,j) in i.list" :key="j"> <div class="item" v-for="(i,j) in i.list" :key="j">
<div></div><p>{{i}}</p> <div></div><p>{{i}}</p>
@ -241,8 +241,8 @@ export default defineComponent({
getdates(userid.value) getdates(userid.value)
} }
function navto(){ function navto(date: string){
router.push("/regime/week") router.push("/regime/week?time=" + (!date? '' : date) )
} }
getdates(userid.value); getdates(userid.value);
return { return {

View File

@ -250,12 +250,14 @@ import store from '@/store';
import { getdatelist, userinfo } from '@/api'; import { getdatelist, userinfo } from '@/api';
import router from '@/router'; import router from '@/router';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { useRoute } from 'vue-router';
export default defineComponent({ export default defineComponent({
props: {}, props: {},
setup() { setup() {
const zhou = ref(0); const zhou = ref(0);
const week = ref<any>(getweek()); const time: any = useRoute().query.time;
const week = ref<any>(getweek(time));
const userid = store.state.userinfo.memberid; const userid = store.state.userinfo.memberid;
console.log(week.value); console.log(week.value);
function getdates(userid: number){ function getdates(userid: number){
@ -295,7 +297,7 @@ export default defineComponent({
}, 2000) }, 2000)
watch(zhou, (value) => { watch(zhou, (value) => {
week.value = getweek(value); week.value = getweek(time, value);
console.log(week.value); console.log(week.value);
getdates(userid) getdates(userid)
}); });