From feda1a3904098d7b11ce0dea324e7b8db6228828 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:18:56 +0800
Subject: [PATCH] 新增 企业管理 3页面
---
src/app/routes/home-page/home-page/home-page.component.ts | 4 +
src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.html | 4 +
src/app/routes/enterprise-management/gis-show/gis-show.component.ts | 17 +++++
src/app/routes/enterprise-management/enterprise-management.module.ts | 39 +++++++++++++
src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.ts | 17 +++++
src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.html | 4 +
src/app/routes/routes-routing.module.ts | 4 +
src/app/routes/enterprise-management/gis-show/gis-show.component.html | 14 ++++
src/assets/app-data.json | 11 ++-
_mock/_chart.ts | 32 ++++++++++
src/app/routes/home-page/home-page/home-page.component.html | 2
src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.ts | 17 +++++
12 files changed, 157 insertions(+), 8 deletions(-)
diff --git a/_mock/_chart.ts b/_mock/_chart.ts
index f59a20e..72c6a6f 100644
--- a/_mock/_chart.ts
+++ b/_mock/_chart.ts
@@ -112,7 +112,36 @@
y: 1231
}
];
-
+const salesTypeDataOnline2 = [
+ {
+ x: "PM2.5",
+ y: 220
+ },
+ {
+ x: "PM10",
+ y: 280
+ },
+ {
+ x: "������������",
+ y: 290
+ },
+ {
+ x: "������������",
+ y: 30
+ },
+ {
+ x: "������",
+ y: 98
+ },
+ {
+ x: '������������',
+ y: 99
+ },
+ {
+ x: "���������0.3",
+ y: 890
+ }
+];
const salesTypeDataOffline = [
{
x: 'PM2.5',
@@ -220,6 +249,7 @@
offlineChartData,
salesTypeData,
salesTypeDataOnline,
+ salesTypeDataOnline2,
salesTypeDataOffline,
radarData
}),
diff --git a/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.html b/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.html
new file mode 100644
index 0000000..abc9972
--- /dev/null
+++ b/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.html
@@ -0,0 +1,4 @@
+<div class="content__title">
+ <h1>������������</h1>
+</div>
+<pro-header [title]="'Page Name'"></pro-header>
diff --git a/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.ts b/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.ts
new file mode 100644
index 0000000..9667d48
--- /dev/null
+++ b/src/app/routes/enterprise-management/enterprise-data/enterprise-data.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-enterprise-data',
+ templateUrl: './enterprise-data.component.html',
+})
+export class EnterpriseDataComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/enterprise-management/enterprise-management.module.ts b/src/app/routes/enterprise-management/enterprise-management.module.ts
new file mode 100644
index 0000000..e4fe867
--- /dev/null
+++ b/src/app/routes/enterprise-management/enterprise-management.module.ts
@@ -0,0 +1,39 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared/shared.module';
+import { GisShowComponent } from './gis-show/gis-show.component';
+import { RouterModule, Routes } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { PipeModule } from '@business/pipe/pipe.module';
+import { EnterpriseDataComponent } from './enterprise-data/enterprise-data.component';
+import { StandardAlarmComponent } from './standard-alarm/standard-alarm.component';
+
+
+const routes: Routes = [
+ {
+ path: '',
+ children: [
+ { path: 'gis-show', component: GisShowComponent },
+ { path: 'enterprise-data', component: EnterpriseDataComponent },
+ { path: 'standard-alarm', component: StandardAlarmComponent }
+ ]
+ }
+];
+const COMPONENT_NOROUNT = [];
+
+@NgModule({
+ imports: [
+ // ������������������������������������
+ PipeModule,
+ CommonModule,
+ SharedModule,
+ RouterModule.forChild(routes)
+ ],
+ declarations: [
+ ...COMPONENT_NOROUNT,
+ EnterpriseDataComponent,
+ StandardAlarmComponent,
+ GisShowComponent
+ ],
+ entryComponents: COMPONENT_NOROUNT
+})
+export class EnterpriseManagementModule { }
diff --git a/src/app/routes/enterprise-management/gis-show/gis-show.component.html b/src/app/routes/enterprise-management/gis-show/gis-show.component.html
new file mode 100644
index 0000000..f118d3a
--- /dev/null
+++ b/src/app/routes/enterprise-management/gis-show/gis-show.component.html
@@ -0,0 +1,14 @@
+<div class="content__title">
+ <h1>GIS������</h1>
+</div>
+<div nz-row [nzGutter]="24" class="pt-lg">
+ <div nz-col nzXs="24" nzMd="24">
+ <nz-card [nzBordered]="false">
+ <ng-template #title>
+ ������������GIS������
+ <small class="text-sm font-weight-normal">������: 128</small>
+ </ng-template>
+ <iframe style="width: 100%; height: 500px;" target="_top" src="http://monitor-api2.7drlb.com/screen/map-page?areaCode=320583&accountId=1&mapType=BMAP_SATELLITE_MAP" frameborder="0"></iframe>
+ </nz-card>
+ </div>
+ </div>
\ No newline at end of file
diff --git a/src/app/routes/enterprise-management/gis-show/gis-show.component.ts b/src/app/routes/enterprise-management/gis-show/gis-show.component.ts
new file mode 100644
index 0000000..83ecedf
--- /dev/null
+++ b/src/app/routes/enterprise-management/gis-show/gis-show.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-gis-show',
+ templateUrl: './gis-show.component.html',
+})
+export class GisShowComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.html b/src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.html
new file mode 100644
index 0000000..d775f47
--- /dev/null
+++ b/src/app/routes/enterprise-management/standard-alarm/standard-alarm.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/enterprise-management/standard-alarm/standard-alarm.component.ts b/src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.ts
new file mode 100644
index 0000000..70e1357
--- /dev/null
+++ b/src/app/routes/enterprise-management/standard-alarm/standard-alarm.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Component({
+ selector: 'app-standard-alarm',
+ templateUrl: './standard-alarm.component.html',
+})
+export class StandardAlarmComponent implements OnInit {
+
+ constructor(
+ private http: _HttpClient
+ ) { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/home-page/home-page/home-page.component.html b/src/app/routes/home-page/home-page/home-page.component.html
index ca221fc..f63270f 100644
--- a/src/app/routes/home-page/home-page/home-page.component.html
+++ b/src/app/routes/home-page/home-page/home-page.component.html
@@ -217,7 +217,7 @@
<label nz-radio-button [nzValue]="'all'"><span>������</span></label>
<label nz-radio-button [nzValue]="'online'"><span>������</span></label>
<label nz-radio-button [nzValue]="'offline'"><span>������</span></label>
- <label nz-radio-button [nzValue]="'online'"><span>������</span></label>
+ <label nz-radio-button [nzValue]="'online2'"><span>������</span></label>
</nz-radio-group>
</div>
</div>
diff --git a/src/app/routes/home-page/home-page/home-page.component.ts b/src/app/routes/home-page/home-page/home-page.component.ts
index 2425846..0535670 100644
--- a/src/app/routes/home-page/home-page/home-page.component.ts
+++ b/src/app/routes/home-page/home-page/home-page.component.ts
@@ -176,7 +176,9 @@
salesTotal = 0;
changeSaleType() {
this.salesPieData = this.salesType === 'all' ? this.data.salesTypeData : (
- this.salesType === 'online' ? this.data.salesTypeDataOnline : this.data.salesTypeDataOffline
+ this.salesType === 'online' ? this.data.salesTypeDataOnline : (
+ this.salesType === 'online2' ? this.data.salesTypeDataOnline2 : this.data.salesTypeDataOffline
+ )
);
if (this.salesPieData) this.salesTotal = this.salesPieData.reduce((pre, now) => now.y + pre, 0);
}
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index c2ea91b..2a66c5d 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -27,6 +27,10 @@
path: "home-page",
loadChildren: "./home-page/home-page.module#HomePageModule"
},
+ {
+ path: "enterprise-management",
+ loadChildren: "./enterprise-management/enterprise-management.module#EnterpriseManagementModule"
+ },
{ path: 'statistics', loadChildren: './statistics/statistics.module#StatisticsModule' },
{ path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
{ path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 083dcb7..874920b 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -36,21 +36,22 @@
},
{
"text": "������������������",
+ "group": true,
"icon": "icon-puzzle",
"children": [
{
- "text": "gis������",
- "link": "/"
+ "text": "GIS������",
+ "link": "/enterprise-management/gis-show"
}
,
{
"text": "������������",
- "link": "/"
+ "link": "/enterprise-management/enterprise-data"
}
,
{
"text": "������������",
- "link": "/"
+ "link": "/enterprise-management/standard-alarm"
}
]
},
@@ -69,7 +70,7 @@
}]
},
{
- "text": "������������",
+ "text": "������������",
"icon": "icon-support",
"link": "/"
},
--
Gitblit v1.8.0