From 19996ed69af73df08d5cb3cb8a8618eb5bc20eb4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 06 Mar 2018 14:12:09 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/reports/demo/demo.component.ts | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 1fcaee6..41abb54 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -4,8 +4,6 @@
import {Component, OnInit} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {Router} from '@angular/router';
-import * as $ from 'jquery'
-
@Component({
selector: 'app-demo',
@@ -24,7 +22,7 @@
items = [{
id: 0,
monitorPoint: null,
- mac: null,
+ mac: '',
time: null,
formatTime: null
}];
@@ -56,7 +54,7 @@
const index = this.items.push({
id,
monitorPoint: null,
- mac: null,
+ mac: '',
time: null,
formatTime: null
});
@@ -95,7 +93,7 @@
});
} else {
this.items[i].monitorPoint = null;
- this.items[i].mac = null;
+ this.items[i].mac = '';
}
}
@@ -111,10 +109,10 @@
}
public typeOptions = [
- {value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m'},
- {value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d'},
- {value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H'},
- {value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i'}
+ {value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
+ {value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
+ {value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
+ {value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
];
@@ -143,6 +141,7 @@
query.typeFormat = this.timeType.typeFormat;
query.xAxisName = this.timeType.xAxisName;
query.label = this.timeType.label;
+ query.timeLength = this.timeType.timeLength;
query.items = JSON.stringify(this.items);
this.router.navigate(['report'], {queryParams: query});
} else {
--
Gitblit v1.8.0