Skip to content

Y
ydLife
Commit bfcac251 by sunchao
Options

日历安装dayjs

parent f64669d8
Showing with 63 additions and 49 deletions
package-lock.json
......@@ -2749,6 +2749,11 @@
"integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
"dev": true
},
"dayjs": {
"version": "1.8.35",
"resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.8.35.tgz?cache=0&sync_timestamp=1599050605311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.8.35.tgz",
"integrity": "sha1-ZxGDePFdMWI/PuKZL1JEuIdgaIg="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
......
package.json
......@@ -23,6 +23,7 @@
"@angular/router": "~7.2.0",
"buffer": "^5.4.3",
"core-js": "^2.5.4",
"dayjs": "^1.8.35",
"html2canvas": "^1.0.0-rc.5",
"ng-zorro-antd-mobile": "^0.12.5",
"rxjs": "~6.3.3",
......
src/app/common/life-common.service.ts
......@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { DatePipe } from '@angular/common';
import { Meta, Title } from '@angular/platform-browser';
import { Subject } from "rxjs/index";
import * as dayjs from 'dayjs'
declare var wx: any;
@Injectable({
providedIn: 'root'
......@@ -232,39 +233,51 @@ export class LifeCommonService {
}
//获取本周日期
makeDate() {
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var week = date.getDay();
// if(week ==0){
// week = 7;
makeDate(date?:any) {
const now = dayjs(date);
return this.weekArr.map((day, idx) => {
return {
week: now.day(idx).day(),
day: now.day(idx).date(),
date: now.day(idx).format('YYYY-MM-DD')
};
});
// var date = new Date();
// var year = date.getFullYear();
// var month = date.getMonth();
// var week = date.getDay();
// // if(week ==0){
// // week = 7;
// // }
// var month = month + 1;
// //获取今天是几号
// var day = date.getDate();
// // 本周内今天的前几天的数量
// var leftNum = week;
// // 本周内今天的后几天的数量
// var rightNum = 6 - week;
// // 本周内今天的前几天
// for (var i = 1; i <= leftNum; i++) {
// this.weekArr[i].week = week- i
// this.weekArr[i].day = day - i;
// this.weekArr[i]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day - i);
// }
var month = month + 1;
//获取今天是几号
var day = date.getDate();
// 本周内今天的前几天的数量
var leftNum = week;
// 本周内今天的后几天的数量
var rightNum = 6 - week;
// 本周内今天的前几天
for (var i = 1; i <= leftNum; i++) {
this.weekArr[i].week = week- i
this.weekArr[i].day = day - i;
this.weekArr[i]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day - i);
}
// 本周内今天的后几天
for (var i = 1; i <= rightNum; i++) {
this.weekArr[i + week].week = week + i ;
this.weekArr[i + week].day = day + i ;
this.weekArr[i + week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day + i);
}
// 今天
this.weekArr[week].week = week;
this.weekArr[week].day = day;
this.weekArr[week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + day;
this.weekArr[week].selected = true;
return this.weekArr;
// // 本周内今天的后几天
// for (var i = 1; i <= rightNum; i++) {
// this.weekArr[i + week].week = week + i ;
// this.weekArr[i + week].day = day + i ;
// this.weekArr[i + week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day + i);
// }
// // 今天
// this.weekArr[week].week = week;
// this.weekArr[week].day = day;
// this.weekArr[week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + day;
// this.weekArr[week].selected = true;
// return this.weekArr;
}
//获取星期
......
src/app/my/todo-list/todo-list.component.html
......@@ -26,7 +26,7 @@
</div>
</div>
<ul class="week">
<li *ngFor="let weekItem of weekArr;index as i;" [ngClass]="{'selected':weekItem.selected}" (click)="selectDay(weekItem)">
<li *ngFor="let weekItem of weekArr;index as i;" [ngClass]="{'selected':weekItem.date == trackDate}" (click)="selectDay(weekItem)">
<div>{{weekItem.day}}</div>
<span>{{lifeCommonService.getWeek(weekItem.week)}}</span>
</li>
......@@ -40,7 +40,7 @@
<div class="taskTime">
<div class="title">时间</div>
<ul>
<li *ngFor="let taskTimeItem of taskTimeList">{{taskTimeItem.time}}</li>
<li *ngFor="let taskTimeItem of taskTimeList" >{{taskTimeItem.time}}</li>
</ul>
</div>
<div class="taskContent">
......
src/app/my/todo-list/todo-list.component.ts
import { Component, OnInit } from '@angular/core';
import { LifeCommonService } from '../../common/life-common.service';
import {MyService} from '../my.service';
import * as dayjs from 'dayjs'
@Component({
selector: 'ydlife-todo-list',
......@@ -47,12 +48,9 @@ export class TodoListComponent implements OnInit {
ngOnInit() {
this.weekArr = this.lifeCommonService.makeDate();
for(let i=0;i<this.weekArr.length;i++){
if(this.weekArr[i]['selected'] == true){
this.trackDate = this.weekArr[i]['date'];
}
}
this.trackDate = dayjs().format('YYYY-MM-DD');
this.queryScheduleTrackList();
console.log(dayjs)
}
goBack(){
......@@ -103,19 +101,16 @@ export class TodoListComponent implements OnInit {
const { startDate, endDate } = value;
this.state = {
...this.state,
...{ show: false, startDate, endDate }
show: false,
startDate,
endDate
};
this.triggerCancel();
this.trackDate = this.lifeCommonService.dateFormat(startDate,"yyyy-MM-dd")
this.trackDate =dayjs(startDate).format('YYYY-MM-DD');
console.log(this.trackDate)
this.queryScheduleTrackList();
for(let i=0;i<this.weekArr.length;i++){
this.weekArr[i].selected = false;
if(this.trackDate == this.weekArr[i]['date']){
this.weekArr[i]['selected'] = true;
break;
}
}
this.weekArr = this.lifeCommonService.makeDate(startDate);
console.log(this.weekArr)
}
queryScheduleTrackList(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment