From a2bd66a59a51c84100474d1ce3eb79d7ed3b754e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/routes.module.ts | 8 +++
src/app/routes/forecasting-warning/forecasting-warning.component.ts | 4 +-
src/app/routes/raise-dust/statistical-query/statistical-query.component.ts | 17 ++++++++
src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html | 4 ++
src/app/routes/raise-dust/statistical-query/statistical-query.component.html | 4 ++
src/app/routes/routes-routing.module.ts | 6 +++
src/app/routes/raise-dust/real-time/real-time.component.ts | 17 ++++++++
src/app/routes/raise-dust/image-grabbing/image-grabbing.component.ts | 17 ++++++++
src/assets/app-data.json | 15 ++++++-
src/app/routes/raise-dust/real-time/real-time.component.html | 4 ++
10 files changed, 91 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/forecasting-warning/forecasting-warning.component.ts b/src/app/routes/forecasting-warning/forecasting-warning.component.ts
index bd33a04..adf144b 100644
--- a/src/app/routes/forecasting-warning/forecasting-warning.component.ts
+++ b/src/app/routes/forecasting-warning/forecasting-warning.component.ts
@@ -88,7 +88,7 @@
};
return [
params[0].value[0],
- '���������' + params[0].value[1] + '���',
+ '���������' + params[0].value[1],
'���������' + directionName[params[0].value[2]]
].join('<br>');
}
@@ -98,7 +98,7 @@
boundaryGap: true
},
yAxis: {
- name: '���������������'
+ name: '���������m/s���'
},
series: [
{
diff --git a/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html
new file mode 100644
index 0000000..e9d3bb7
--- /dev/null
+++ b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html
@@ -0,0 +1,4 @@
+<div class="content__title">
+ <h1>Page Name</h1>
+</div>
+<pro-header [title]="'Page Name'"></pro-header>
diff --git a/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.ts b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.ts
new file mode 100644
index 0000000..dcc2093
--- /dev/null
+++ b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-image-grabbing',
+ templateUrl: './image-grabbing.component.html',
+})
+export class ImageGrabbingComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/raise-dust/real-time/real-time.component.html b/src/app/routes/raise-dust/real-time/real-time.component.html
new file mode 100644
index 0000000..e9d3bb7
--- /dev/null
+++ b/src/app/routes/raise-dust/real-time/real-time.component.html
@@ -0,0 +1,4 @@
+<div class="content__title">
+ <h1>Page Name</h1>
+</div>
+<pro-header [title]="'Page Name'"></pro-header>
diff --git a/src/app/routes/raise-dust/real-time/real-time.component.ts b/src/app/routes/raise-dust/real-time/real-time.component.ts
new file mode 100644
index 0000000..bf43ace
--- /dev/null
+++ b/src/app/routes/raise-dust/real-time/real-time.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-real-time',
+ templateUrl: './real-time.component.html',
+})
+export class RealTimeComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/raise-dust/statistical-query/statistical-query.component.html b/src/app/routes/raise-dust/statistical-query/statistical-query.component.html
new file mode 100644
index 0000000..e9d3bb7
--- /dev/null
+++ b/src/app/routes/raise-dust/statistical-query/statistical-query.component.html
@@ -0,0 +1,4 @@
+<div class="content__title">
+ <h1>Page Name</h1>
+</div>
+<pro-header [title]="'Page Name'"></pro-header>
diff --git a/src/app/routes/raise-dust/statistical-query/statistical-query.component.ts b/src/app/routes/raise-dust/statistical-query/statistical-query.component.ts
new file mode 100644
index 0000000..22fc612
--- /dev/null
+++ b/src/app/routes/raise-dust/statistical-query/statistical-query.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-statistical-query',
+ templateUrl: './statistical-query.component.html',
+})
+export class StatisticalQueryComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 0304e52..a6d1668 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -17,8 +17,11 @@
import { PollutionManagementComponent } from 'app/routes/pollution/management/management.component';
import { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';
import { GridTraceComponent } from './grid-trace/grid-trace.component';
+import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';
import { SandTableComponent } from './sand-table/sand-table.component';
import { RaiseDustComponent } from './raise-dust/raise-dust.component';
+import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
+import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';
const routes: Routes = [
{
@@ -46,6 +49,9 @@
},
{ path: 'sand-table', component: SandTableComponent },
{ path: 'raise-dust', component: RaiseDustComponent },
+ { path: 'raise-dust/real-time', component: RealTimeComponent },
+ { path: 'raise-dust/statistical-query', component: StatisticalQueryComponent },
+ { path: 'raise-dust/image-grabbing', component: ImageGrabbingComponent },
]
}, // passport
{
diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 16a911d..1c17f82 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -36,6 +36,9 @@
import { GridTraceComponent } from './grid-trace/grid-trace.component';
import { RaiseDustComponent } from './raise-dust/raise-dust.component';
import { SandTableComponent } from './sand-table/sand-table.component';
+import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
+import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';
+import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';
@NgModule({
imports: [ SharedModule, RouteRoutingModule ],
@@ -54,7 +57,10 @@
EnvironmentManagementComponent,
GridTraceComponent,
RaiseDustComponent,
- SandTableComponent
+ SandTableComponent,
+ RealTimeComponent,
+ StatisticalQueryComponent,
+ ImageGrabbingComponent
],
providers: [
_HttpClient,
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 3e82812..9b83d2c 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -97,12 +97,23 @@
{
"text": "������������",
"icon": "icon-flag",
- "link": "/sand-table"
+ "children":[
+ {
+ "text": "���������������������",
+ "link": "/raise-dust/real-time"
+ },{
+ "text": "���������������������",
+ "link": "/raise-dust/statistical-query"
+ },{
+ "text": "������������",
+ "link": "/raise-dust/image-grabbing"
+ }
+ ]
},
{
"text": "������������",
"icon": "icon-people",
- "link": "/raise-dust"
+ "link": "/sand-table"
}
]
}
--
Gitblit v1.8.0