Merge pull request #500 from BennieMeng/feature/kuber-node

frontend: fix reportform/deploy time warning
Qihoo360 · Nov 1, 2019 · b63e32c · b63e32c
2 parents c8df62e + 96d7766
commit b63e32c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/frontend/src/app/admin/reportform/deploy/deploy.component.html b/src/frontend/src/app/admin/reportform/deploy/deploy.component.html
@@ -3,12 +3,10 @@
     <div class="clr-row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
       <h2 class="header-title">上线次数统计</h2>
     </div>
-    <div class="clr-row flex-items-xs-between" style="height:32px;margin-left: 5px">
-      <div class="option-left">
-        {{'TITLE.START_TIME' | translate}}：<input type="date" id="startTime" name="startTime" [(ngModel)]="startTime" clrDate>
-        {{'TITLE.FINISH_TIME' | translate}}：<input type="date" id="endTime" name="endTime" [(ngModel)]="endTime" clrDate>
-        <button class="btn" (click)="search()">查询</button>
-      </div>
+    <div class="clr-row flex-items-xs-between" style="margin-left: 5px">
+      <label for="startTime" class="time-label">{{'TITLE.START_TIME' | translate}}：</label><input type="date" id="startTime" name="startTime" [(ngModel)]="startTime" clrDate>
+      <label for="endTime" class="time-label">{{'TITLE.FINISH_TIME' | translate}}：</label><input type="date" id="endTime" name="endTime" [(ngModel)]="endTime" clrDate>
+      <button class="btn" (click)="search()">查询</button>
     </div>
     <clr-datagrid (clrDgRefresh)="refresh($event)">
       <clr-dg-column class="col-id">

diff --git a/src/frontend/src/app/admin/reportform/deploy/deploy.component.scss b/src/frontend/src/app/admin/reportform/deploy/deploy.component.scss
@@ -0,0 +1,4 @@
+.time-label {
+  display: flex;
+  align-items: flex-end;
+}
diff --git a/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts b/src/frontend/src/app/admin/reportform/deploy/deploy.component.ts
@@ -6,6 +6,7 @@ import * as moment from 'moment';
 
 @Component({
   selector: 'wayne-deploy',
+  styleUrls: ['./deploy.component.scss'],
   templateUrl: './deploy.component.html'
 })
 export class DeployComponent implements OnInit {
@@ -32,7 +33,8 @@ export class DeployComponent implements OnInit {
 
   refresh(state?: ClrDatagridStateInterface) {
     this.publishService.getDeployStatistics(
-      moment(this.startTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z', moment(this.endTime).format('YYYY-MM-DDTHH:mm:SS') + 'Z').
+      moment(this.startTime, 'MM/DD/YYYY', true).format('YYYY-MM-DDTHH:mm:SS') + 'Z',
+       moment(this.endTime, 'MM/DD/YYYY', true).format('YYYY-MM-DDTHH:mm:SS') + 'Z').
     subscribe(
       resp => {
         this.datas = resp.data;