From eef69fa1194f6ab215b08a8baaf402d0539362cc Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:56:59 +0800
Subject: [PATCH] 日历完善，设备相关功能开发
---
src/app/routes/statistics/calendar/calendar.component.html | 66 ++++++++++++---------------------
1 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/src/app/routes/statistics/calendar/calendar.component.html b/src/app/routes/statistics/calendar/calendar.component.html
index 9f31405..49de164 100644
--- a/src/app/routes/statistics/calendar/calendar.component.html
+++ b/src/app/routes/statistics/calendar/calendar.component.html
@@ -1,45 +1,27 @@
-<div nz-row [nzGutter]="24">
- <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
- <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
- <ng-template #extra>
- <div class="sales-card-extra">
- <div class="sales-type-radio">
- <nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
- <label nz-radio-button [nzValue]="'1'"><span>PM2.5</span></label>
- <label nz-radio-button [nzValue]="'2'"><span>PM10</span></label>
- <label nz-radio-button [nzValue]="'3'"><span>SO2</span></label>
- <label nz-radio-button [nzValue]="'4'"><span>NO3</span></label>
- <label nz-radio-button [nzValue]="'5'"><span>O3</span></label>
- <label nz-radio-button [nzValue]="'6'"><span>CO</span></label>
- </nz-radio-group>
- </div>
- </div>
- </ng-template>
- <ng-template #body>
- <h4 class="margin:8px 0 32px 0;">������������������</h4>
-
- <nz-table #keyTable [nzDataSource]="data.searchData" [nzPageSize]="5" nzSize="small">
- <thead nz-thead>
- <tr>
- <th nz-th><span>������</span></th>
- <th nz-th><span>������������</span></th>
- <th nz-th class="text-right">
- <span>������������ mg/m3</span>
- <nz-table-sort (nzValueChange)="sort('count',$event)"></nz-table-sort>
- </th>
- </tr>
- </thead>
- <tbody nz-tbody>
- <tr nz-tbody-tr *ngFor="let i of keyTable.data">
- <td nz-td>{{i.index}}</td>
- <td nz-td><a (click)="msg.success(i.point)">{{i.point}}</a></td>
- <td nz-td class="text-right">{{i.value}}</td>
- </tr>
- </tbody>
- </nz-table>
- </ng-template>
- </nz-card>
- </div>
+<div class="content__title">
+ <h1>
+ ������������
+ <small>������������������������</small>
+ </h1>
+</div>
+<div nz-row [nzGutter]="24" style="padding: 20px">
+ <div nz-col nzXs="24" nzMd="24">
+ <div nz-form-control nz-col [nzSm]="20">
+ <nz-card [nzBordered]="false">
+ <nz-calendar [nzLocale]="'zh-cn'" >
+ <ng-template #dateCell let-day>
+ <div *ngIf="!isExpire(day.date) && isCellExist(day.date)" style="width: 80px;height: 80px;display: block;position: absolute;" (click)="calendarClick(day.date)">
+ <nz-badge [nzStatus]="calendarDayCells[day.date|date:'dd']['status']" [nzText]="calendarDayCells[day.date|date:'dd']['statusName']" ></nz-badge>
+ <!-- <nz-badge [nzStatus]="'success'" [nzText]="'Sunday'" *ngIf="(day.date|date:'EEE')==='Sun'"></nz-badge>
+ {{day.date|date:'EEE'}}
+ {{day.date|date:'dd'}}
+ {{calendarDayCells[day.date|date:'dd']['status']}} -->
+ </div>
+ </ng-template>
+ </nz-calendar>
+ </nz-card>
+ </div>
+ </div>
</div>
--
Gitblit v1.8.0