From 46ca57d5f64bafb642017b50c2fba85e38ca2289 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Jul 2018 10:05:49 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/statistics/calendar/calendar.component.html | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/statistics/calendar/calendar.component.html b/src/app/routes/statistics/calendar/calendar.component.html
index 121743b..35c5175 100644
--- a/src/app/routes/statistics/calendar/calendar.component.html
+++ b/src/app/routes/statistics/calendar/calendar.component.html
@@ -1,8 +1,13 @@
<div nz-row [nzGutter]="24" style="padding: 20px">
- <div nz-col nzXs="24" nzSm="12" nzMd="24" nzLg="9">
+ <div nz-col nzXs="24" nzMd="24">
<div nz-form-control nz-col [nzSm]="20">
- <nz-datepicker></nz-datepicker>
+ <nz-calendar [nzLocale]="'zh-cn'" style="width: 290px; border: 1px solid rgb(217, 217, 217); border-radius: 4px;">
+ <!-- <ng-template #dateCell let-day>
+ <div style="width: 22px;height: 22px;display: block;position: absolute; background-color: red;">
+ </div>
+ </ng-template> -->
+ </nz-calendar>
</div>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="24" nzLg="15">
--
Gitblit v1.8.0