From c69ddde7828d777f04c6468c269aaa0aa03d72c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 02 Aug 2018 09:50:58 +0800
Subject: [PATCH] 文件修改
---
src/app/business/services/http/device-adjust-value.service.ts | 2
src/app/routes/operation/device-status/device-status.component.ts | 78 ++++++---
src/app/core/core.module.ts | 4
src/app/routes/operation/device-data/device-data.component.ts | 33 ++++
src/app/routes/report/report.component.ts | 2
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts | 2
src/app/business/services/http/login.service.ts | 2
src/app/routes/operation/device-maintenance/device-maintenance.component.ts | 6
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts | 1
src/app/routes/operation/data-audit/data-audit.component.ts | 2
src/app/routes/environment/management/management.component.ts | 10
src/app/routes/pollution/management/management.component.ts | 2
src/app/routes/forecasting-warning/forecasting-warning.component.ts | 8
src/app/routes/statistics/calendar/calendar.component.ts | 11 +
src/app/business/services/http/device.service.ts | 2
src/app/routes/operation/device-controller/device-controller.component.html | 9 +
src/app/business/services/http/monitor-point.service.ts | 2
src/app/core/startup/startup.service.ts | 2
src/app/routes/dashboard/workplace/workplace.component.ts | 2
src/app/routes/operation/device-data/device-data.component.html | 181 ++++++++++++++++++++++
src/app/app.module.ts | 4
src/app/routes/operation/device-controller/device-controller.component.ts | 18 ++
src/assets/app-data.json | 2
src/testing/common.spec.ts | 4
src/app/routes/devices/version/version.component.ts | 2
src/main.ts | 6
src/app/business/services/http/areacode.service.ts | 2
src/app/routes/operation/device-controller/device-controller.service.ts | 9 +
src/app/routes/routes-routing.module.ts | 6
src/app/business/pipe/pipe.module.ts | 2
src/app/routes/operation/operation.module.ts | 16 +
31 files changed, 357 insertions(+), 75 deletions(-)
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b3d93f0..f5b03a8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,8 +4,8 @@
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { DelonModule } from './delon.module';
-import { CoreModule } from './core/core.module';
-import { SharedModule } from './shared/shared.module';
+import { CoreModule } from '@core/core.module';
+import { SharedModule } from '@shared/shared.module';
import { AppComponent } from './app.component';
import { RoutesModule } from './routes/routes.module';
import { LayoutModule } from './layout/layout.module';
diff --git a/src/app/business/pipe/pipe.module.ts b/src/app/business/pipe/pipe.module.ts
index c845221..6d505e6 100644
--- a/src/app/business/pipe/pipe.module.ts
+++ b/src/app/business/pipe/pipe.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { TyepHandlePipe } from './tyep-handle.pipe';
+import { TyepHandlePipe } from '@business/pipe/tyep-handle.pipe';
import { DateService } from '@business/services/util/date.service';
@NgModule({
diff --git a/src/app/business/services/http/areacode.service.ts b/src/app/business/services/http/areacode.service.ts
index c6e9d7d..64d5875 100644
--- a/src/app/business/services/http/areacode.service.ts
+++ b/src/app/business/services/http/areacode.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { _HttpClient } from '@delon/theme/services/http/http.client';
import { Observable } from 'rxjs/Observable';
-import { environment } from 'environments/environment';
+import { environment } from '@env/environment';
@Injectable()
export class AreacodeService {
diff --git a/src/app/business/services/http/device-adjust-value.service.ts b/src/app/business/services/http/device-adjust-value.service.ts
index e18142a..6f9af82 100644
--- a/src/app/business/services/http/device-adjust-value.service.ts
+++ b/src/app/business/services/http/device-adjust-value.service.ts
@@ -1,4 +1,4 @@
-import { environment } from 'environments/environment';
+import { environment } from '@env/environment';
import { _HttpClient } from '@delon/theme';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
diff --git a/src/app/business/services/http/device.service.ts b/src/app/business/services/http/device.service.ts
index 31de514..3eb7c85 100644
--- a/src/app/business/services/http/device.service.ts
+++ b/src/app/business/services/http/device.service.ts
@@ -1,5 +1,5 @@
import { _HttpClient } from '@delon/theme';
-import { environment } from 'environments/environment';
+import { environment } from '@env/environment';
import { Injectable } from '@angular/core';
import { ResultBean, PageBean } from '@business/entity/grid';
import { Observable } from 'rxjs/Observable';
diff --git a/src/app/business/services/http/login.service.ts b/src/app/business/services/http/login.service.ts
index 989d7d7..b5e7c97 100644
--- a/src/app/business/services/http/login.service.ts
+++ b/src/app/business/services/http/login.service.ts
@@ -1,6 +1,6 @@
import { Authorization } from '@business/entity/token';
import { HttpClient } from '@angular/common/http';
-import { environment } from 'environments/environment';
+import { environment } from '@env/environment';
import { Observable } from 'rxjs/Observable';
import { Injectable, Inject } from '@angular/core';
import { UserContext } from '@business/entity/data';
diff --git a/src/app/business/services/http/monitor-point.service.ts b/src/app/business/services/http/monitor-point.service.ts
index a506840..fc2aca7 100644
--- a/src/app/business/services/http/monitor-point.service.ts
+++ b/src/app/business/services/http/monitor-point.service.ts
@@ -1,7 +1,7 @@
import { PageBean, ResultBean } from '@business/entity/grid';
import { ExampleService } from '@business/services/util/example.service';
import { _HttpClient } from '@delon/theme';
-import { environment } from 'environments/environment';
+import { environment } from '@env/environment';
import { RouteConfigLoadStart } from '@angular/router';
import { Injectable } from '@angular/core';
import { equal } from 'assert';
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 29760e9..f81946e 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,7 +1,7 @@
import { NgModule, Optional, SkipSelf } from '@angular/core';
-import { throwIfAlreadyLoaded } from './module-import-guard';
+import { throwIfAlreadyLoaded } from '@core/module-import-guard';
-import { I18NService } from './i18n/i18n.service';
+import { I18NService } from '@core/i18n/i18n.service';
@NgModule({
providers: [
diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts
index 1cb67ee..3127fbc 100644
--- a/src/app/core/startup/startup.service.ts
+++ b/src/app/core/startup/startup.service.ts
@@ -5,7 +5,7 @@
import { TranslateService } from '@ngx-translate/core';
import { MenuService, SettingsService, TitleService } from '@delon/theme';
import { ACLService } from '@delon/acl';
-import { I18NService } from '../i18n/i18n.service';
+import { I18NService } from '@core/i18n/i18n.service';
/**
* ���������������������
diff --git a/src/app/routes/dashboard/workplace/workplace.component.ts b/src/app/routes/dashboard/workplace/workplace.component.ts
index a3ede59..0fff804 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.ts
+++ b/src/app/routes/dashboard/workplace/workplace.component.ts
@@ -1,4 +1,4 @@
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env/environment';
import { zip } from 'rxjs/observable/zip';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index 4fe30c2..d7a214e 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -13,7 +13,6 @@
import { ExampleService } from '@business/services/util/example.service';
import { Observable } from 'rxjs/Observable';
import { OrganizationService } from '@business/services/http/organization.service';
-import { debug } from 'util';
@Component({
selector: 'app-device-edit',
diff --git a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
index 669a144..d108869 100644
--- a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
@@ -1,6 +1,6 @@
import { MonitorPoint } from '@business/entity/data';
import { PageBean } from '@business/entity/grid';
-import { OrganizationService } from '@business/services/http//organization.service';
+import { OrganizationService } from '@business/services/http/organization.service';
import { AreacodeService } from '@business/services/http/areacode.service';
import { Component, OnInit } from '@angular/core';
import { NzMessageService, NzModalSubject } from 'ng-zorro-antd';
diff --git a/src/app/routes/devices/version/version.component.ts b/src/app/routes/devices/version/version.component.ts
index 6e970b7..ec53ec2 100644
--- a/src/app/routes/devices/version/version.component.ts
+++ b/src/app/routes/devices/version/version.component.ts
@@ -12,7 +12,7 @@
import { VersionService } from '@business/services/http/version.service';
import { Types } from '@business/enum/types.enum';
import { Column, Grid, PageBean } from '@business/entity/grid';
-import { VersionEditComponent } from 'app/routes/devices/version/version-edit/version-edit.component';
+import { VersionEditComponent } from './version-edit/version-edit.component';
@Component({
diff --git a/src/app/routes/environment/management/management.component.ts b/src/app/routes/environment/management/management.component.ts
index d2ced06..eb73346 100644
--- a/src/app/routes/environment/management/management.component.ts
+++ b/src/app/routes/environment/management/management.component.ts
@@ -1,4 +1,4 @@
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env/environment';
import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { _HttpClient } from '@delon/theme';
@@ -58,22 +58,22 @@
ngAfterViewInit() {
const PM25 = echarts.init(document.getElementById('PM25'));
PM25.showLoading();
- const params = {
+ const params = {
type: 'month',
sensors: JSON.stringify(['e1']),
items: JSON.stringify([
{areaCode: 320583, formatTime: moment().format('YYYY-MM')},
{areaCode: 320583, formatTime: moment().subtract(1, 'M').format('YYYY-MM')}
- ])
+ ])
};
this.http2.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
const PM25Option = $.extend(true,
- {
+ {
xAxis: {data: res.data.times},
series: [
{data: res.data.datas[0]['e1']},
{data: res.data.datas[1]['e1']}
- ]
+ ]
},
this.option);
PM25.setOption(PM25Option, false);
diff --git a/src/app/routes/forecasting-warning/forecasting-warning.component.ts b/src/app/routes/forecasting-warning/forecasting-warning.component.ts
index adf144b..2e44734 100644
--- a/src/app/routes/forecasting-warning/forecasting-warning.component.ts
+++ b/src/app/routes/forecasting-warning/forecasting-warning.component.ts
@@ -1,4 +1,4 @@
-import {environment} from '../../../environments/environment';
+import {environment} from '@env/environment';
import {HttpClient} from '@angular/common/http';
import {Component, OnInit} from '@angular/core';
import {_HttpClient} from '@delon/theme';
@@ -174,7 +174,8 @@
this.isShow = true;
this.initWarning();
} else {
- this.isShow = false;
this.initForecasting();
+ this.isShow = false;
+ this.initForecasting();
}
}
@@ -209,7 +210,8 @@
this.option.title.text = title + '(������)';
this.option.yAxis.name = '������������';
this.option.series[0].data = temp;
- this.option.series[0].itemStyle.color = this.colors[0];
forecasting_tempChart.setOption(this.option, false);
+ this.option.series[0].itemStyle.color = this.colors[0];
+ forecasting_tempChart.setOption(this.option, false);
const forecasting_humidityChart = echarts.init(document.getElementById('forecasting_humidity'));
this.option.title.text = title + '(������)';
diff --git a/src/app/routes/operation/data-audit/data-audit.component.ts b/src/app/routes/operation/data-audit/data-audit.component.ts
index 6c4227f..4addb50 100644
--- a/src/app/routes/operation/data-audit/data-audit.component.ts
+++ b/src/app/routes/operation/data-audit/data-audit.component.ts
@@ -67,7 +67,7 @@
// ������������������������������������������
public sensorNameScrollLeft = 0;
public sensorNameScrollTop = 0;
- @ViewChild(NzTreeComponent) private tree: NzTreeComponent;
+ // @ViewChild(NzTreeComponent) private tree: NzTreeComponent;
private _timeType: {showTime: boolean|{[key: string]: Function|boolean}, mode: 'month' | 'day', dateFormat: string } = {showTime: false, mode: 'day', dateFormat: 'YYYY���MM���DD���'};
// ���key-value������,������������������
private _sensors: {[key: string]: string} = {};
diff --git a/src/app/routes/operation/device-controller/device-controller.component.html b/src/app/routes/operation/device-controller/device-controller.component.html
new file mode 100644
index 0000000..4dbc21d
--- /dev/null
+++ b/src/app/routes/operation/device-controller/device-controller.component.html
@@ -0,0 +1,9 @@
+<!-- <ng-template [ngSwitch]="deviceControllerService.incumbent">
+ <app-device-status *ngSwitchCase="status"></app-device-status>
+</ng-template> -->
+<ng-container [ngSwitch]="deviceControllerService.incumbent">
+ <app-device-status *ngSwitchCase="'status'"></app-device-status>
+ <app-device-data *ngSwitchCase="'data'"></app-device-data>
+ <app-device-status *ngSwitchDefault>
+ </app-device-status>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/routes/operation/device-controller/device-controller.component.ts b/src/app/routes/operation/device-controller/device-controller.component.ts
new file mode 100644
index 0000000..24f4904
--- /dev/null
+++ b/src/app/routes/operation/device-controller/device-controller.component.ts
@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+import { DeviceControllerService } from './device-controller.service';
+
+@Component({
+ selector: 'app-device-controller',
+ templateUrl: './device-controller.component.html',
+ providers:[DeviceControllerService]
+})
+export class DeviceControllerComponent implements OnInit {
+ constructor(
+ private http: _HttpClient,
+ public deviceControllerService:DeviceControllerService
+ ) { }
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/routes/operation/device-controller/device-controller.service.ts b/src/app/routes/operation/device-controller/device-controller.service.ts
new file mode 100644
index 0000000..6ef34bf
--- /dev/null
+++ b/src/app/routes/operation/device-controller/device-controller.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class DeviceControllerService {
+ public incumbent: 'data'|'status' = 'status';
+ public data: any = {};
+ constructor() { }
+
+}
diff --git a/src/app/routes/operation/device-data/device-data.component.html b/src/app/routes/operation/device-data/device-data.component.html
new file mode 100644
index 0000000..0543e0d
--- /dev/null
+++ b/src/app/routes/operation/device-data/device-data.component.html
@@ -0,0 +1,181 @@
+<pro-header [title]="'������:'+ deviceData.name">
+ <ng-template #logo><img src="https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png"></ng-template>
+ <ng-template #action>
+ <button nz-button [nzType]="'primary'" [nzSize]="'large'" (click) ="toDeviceStatus()">������</button>
+ </ng-template>
+ <ng-template #content>
+ <desc-list size="small" col="2">
+ <desc-list-item term="���������">���������</desc-list-item>
+ <desc-list-item term="������������">XX ������</desc-list-item>
+ <desc-list-item term="������������">2017-07-07</desc-list-item>
+ <desc-list-item term="������������"><a (click)="msg.success('yes')">12421</a></desc-list-item>
+ <desc-list-item term="������������">2017-07-07 ~ 2017-08-08</desc-list-item>
+ <desc-list-item term="������">������������������������������</desc-list-item>
+ </desc-list>
+ </ng-template>
+ <ng-template #extra>
+ <div nz-row>
+ <div nz-col nzXs="24" nzSm="12">
+ <p class="text-grey">������</p>
+ <p class="text-lg">���������</p>
+ </div>
+ <div nz-col nzXs="24" nzSm="12">
+ <p class="text-grey">������������</p>
+ <p class="text-lg">�� 568.08</p>
+ </div>
+ </div>
+ </ng-template>
+ <ng-template #tab>
+ <nz-tabset [nzSize]="'default'">
+ <nz-tab><ng-template #nzTabHeading>������</ng-template></nz-tab>
+ <nz-tab><ng-template #nzTabHeading>������</ng-template></nz-tab>
+ </nz-tabset>
+ </ng-template>
+ </pro-header>
+ <nz-card [nzBordered]="false" class="mb-lg" nzTitle="������������">
+ <nz-steps [nzCurrent]="1">
+ <nz-step [nzTitle]="'������������'" [nzDescription]="createDesc">
+ <ng-template #createDesc>
+ <p class="my-sm">���������<nz-icon nzType="dingding-o" class="ml-sm"></nz-icon></p>
+ <p>2016-12-12 12:32</p>
+ </ng-template>
+ </nz-step>
+ <nz-step [nzTitle]="'������������'" [nzDescription]="checkedDesc">
+ <ng-template #checkedDesc>
+ <p class="my-sm">���������<nz-icon nzType="dingding-o" style="color: #00A0E9" class="ml-sm"></nz-icon></p>
+ <a (click)="msg.success('click')">���������</a>
+ </ng-template>
+ </nz-step>
+ <nz-step [nzTitle]="'������������'"></nz-step>
+ <nz-step [nzTitle]="'������'"></nz-step>
+ </nz-steps>
+ <div class="steps-content"></div>
+ </nz-card>
+ <nz-card [nzBordered]="false" nzTitle="������������" class="mb-lg">
+ <desc-list class="mb-lg">
+ <desc-list-item term="������������">���������</desc-list-item>
+ <desc-list-item term="������������">32943898021309809423</desc-list-item>
+ <desc-list-item term="���������">3321944288191034921</desc-list-item>
+ <desc-list-item term="������������">18112345678</desc-list-item>
+ <desc-list-item term="������������">��������� 18100000000 ������������������������������������������������������������</desc-list-item>
+ </desc-list>
+ <desc-list class="mb-lg" title="���������">
+ <desc-list-item term="������������">725</desc-list-item>
+ <desc-list-item term="���������������������">2017-08-08</desc-list-item>
+ <desc-list-item> </desc-list-item>
+ <desc-list-item [term]="term">
+ <ng-template #term>
+ ������������
+ <nz-tooltip [nzTitle]="'������������'">
+ <span nz-tooltip><i class="anticon anticon-info-circle-o"></i></span>
+ </nz-tooltip>
+ </ng-template>
+ 725
+ </desc-list-item>
+ <desc-list-item term="���������������������">2017-08-08</desc-list-item>
+ </desc-list>
+ <h4 class="mb-md">���������</h4>
+ <nz-card nzType="inner" nzTitle="������������������">
+ <desc-list size="small" title="���������" class="mb-md">
+ <desc-list-item term="���������">���������</desc-list-item>
+ <desc-list-item term="���������">1234567</desc-list-item>
+ <desc-list-item term="������������">XX������ - YY���</desc-list-item>
+ <desc-list-item term="������������">2017-08-08</desc-list-item>
+ <desc-list-item term="������">������������������������������������������������������������������������������������������������...</desc-list-item>
+ </desc-list>
+ <nz-divider class="mb-md"></nz-divider>
+ <desc-list size="small" title="���������" col="1" class="mb-md">
+ <desc-list-item term="������">
+ Citrullus lanatus (Thunb.) Matsum. et Nakai������������������������������������������������������������������������..
+ </desc-list-item>
+ </desc-list>
+ <nz-divider class="mb-md"></nz-divider>
+ <desc-list size="small" title="���������">
+ <desc-list-item term="���������">���������</desc-list-item>
+ <desc-list-item term="���������">1234568</desc-list-item>
+ </desc-list>
+ </nz-card>
+ </nz-card>
+ <nz-card [nzBordered]="false" nzTitle="���������������������������" class="mb-lg">
+ <div class="no-data">
+ <i class="anticon anticon-frown-o"></i>������������
+ </div>
+ </nz-card>
+ <nz-card [nzBordered]="false">
+ <nz-card-tab nzTabHeading="���������������">
+ <nz-table [nzDataSource]="data.advancedOperation1" [nzIsPagination]="false">
+ <thead nz-thead>
+ <tr>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>���������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������</span></th>
+ </tr>
+ </thead>
+ <tbody nz-tbody>
+ <tr nz-tbody-tr *ngFor="let i of data.advancedOperation1">
+ <td nz-td>{{i.type}}</td>
+ <td nz-td>{{i.name}}</td>
+ <td nz-td>
+ <nz-badge *ngIf="i.status === 'success'" [nzStatus]="'success'" [nzText]="'������'"></nz-badge>
+ <nz-badge *ngIf="i.status !== 'success'" [nzStatus]="'processing'" [nzText]="'���������'"></nz-badge>
+ </td>
+ <td nz-td>{{i.updatedAt | _date}}</td>
+ <td nz-td>{{i.memo}}</td>
+ </tr>
+ </tbody>
+ </nz-table>
+ </nz-card-tab>
+ <nz-card-tab nzTabHeading="���������������">
+ <nz-table [nzDataSource]="data.advancedOperation2" [nzIsPagination]="false">
+ <thead nz-thead>
+ <tr>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>���������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������</span></th>
+ </tr>
+ </thead>
+ <tbody nz-tbody>
+ <tr nz-tbody-tr *ngFor="let i of data.advancedOperation2">
+ <td nz-td>{{i.type}}</td>
+ <td nz-td>{{i.name}}</td>
+ <td nz-td>
+ <nz-badge *ngIf="i.status === 'success'" [nzStatus]="'success'" [nzText]="'������'"></nz-badge>
+ <nz-badge *ngIf="i.status !== 'success'" [nzStatus]="'processing'" [nzText]="'���������'"></nz-badge>
+ </td>
+ <td nz-td>{{i.updatedAt | _date}}</td>
+ <td nz-td>{{i.memo}}</td>
+ </tr>
+ </tbody>
+ </nz-table>
+ </nz-card-tab>
+ <nz-card-tab nzTabHeading="���������������">
+ <nz-table [nzDataSource]="data.advancedOperation3" [nzIsPagination]="false">
+ <thead nz-thead>
+ <tr>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>���������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������������</span></th>
+ <th nz-th><span>������</span></th>
+ </tr>
+ </thead>
+ <tbody nz-tbody>
+ <tr nz-tbody-tr *ngFor="let i of data.advancedOperation3">
+ <td nz-td>{{i.type}}</td>
+ <td nz-td>{{i.name}}</td>
+ <td nz-td>
+ <nz-badge *ngIf="i.status === 'success'" [nzStatus]="'success'" [nzText]="'������'"></nz-badge>
+ <nz-badge *ngIf="i.status !== 'success'" [nzStatus]="'processing'" [nzText]="'���������'"></nz-badge>
+ </td>
+ <td nz-td>{{i.updatedAt | _date}}</td>
+ <td nz-td>{{i.memo}}</td>
+ </tr>
+ </tbody>
+ </nz-table>
+ </nz-card-tab>
+ </nz-card>
+
\ No newline at end of file
diff --git a/src/app/routes/operation/device-data/device-data.component.ts b/src/app/routes/operation/device-data/device-data.component.ts
new file mode 100644
index 0000000..f4773c3
--- /dev/null
+++ b/src/app/routes/operation/device-data/device-data.component.ts
@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { DeviceControllerService } from '../device-controller/device-controller.service';
+
+@Component({
+ selector: 'app-device-data',
+ templateUrl: './device-data.component.html'
+})
+export class DeviceDataComponent implements OnInit {
+ data = {
+ advancedOperation1: [],
+ advancedOperation2: [],
+ advancedOperation3: []
+ };
+ public get deviceData() {
+ return this.deviceControllerService.data;
+ }
+ constructor(
+ public msg: NzMessageService,
+ private http: _HttpClient,
+ private deviceControllerService:DeviceControllerService,
+ ) {}
+ /**
+ * toDeviceStatus
+ */
+ public toDeviceStatus() {
+ this.deviceControllerService.incumbent = 'status';
+ }
+ ngOnInit() {
+ this.http.get('/profile/advanced').subscribe((res: any) => this.data = res);
+ }
+}
diff --git a/src/app/routes/operation/device-maintenance/device-maintenance.component.ts b/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
index e4b58d0..8bf1f54 100644
--- a/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
+++ b/src/app/routes/operation/device-maintenance/device-maintenance.component.ts
@@ -7,8 +7,8 @@
import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
import { SimpleTableColumn, SimpleTableComponent } from '@delon/abc';
import { Subject } from 'rxjs/Subject';
-import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
-import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { CoordinatesPickerComponent } from '../../map/coordinates-picker/coordinates-picker.component';
+import { CoorPickerService } from '../../map/coordinates-picker/coordinates-picker.service';
import { OrganizationService } from '@business/services/http/organization.service';
import { ExampleService, Criteria } from '@business/services/util/example.service';
import { AdjustConfigComponent } from '../../devices/basic-info/adjust-config/adjust-config.component';
@@ -39,7 +39,7 @@
{
text: '������',
type: 'del',
- click: (record: any) => this.delete(record.id)
+ click: (record: any) => this.addOrModify(record.id)
},
{
text: '������',
diff --git a/src/app/routes/operation/device-status/device-status.component.ts b/src/app/routes/operation/device-status/device-status.component.ts
index dbd700b..6967f52 100644
--- a/src/app/routes/operation/device-status/device-status.component.ts
+++ b/src/app/routes/operation/device-status/device-status.component.ts
@@ -7,12 +7,12 @@
import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
import { SimpleTableColumn, SimpleTableComponent } from '@delon/abc';
import { Subject } from 'rxjs/Subject';
-import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
-import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { CoordinatesPickerComponent } from '../../map/coordinates-picker/coordinates-picker.component';
+import { CoorPickerService } from '../../map/coordinates-picker/coordinates-picker.service';
import { OrganizationService } from '@business/services/http/organization.service';
import { ExampleService, Criteria } from '@business/services/util/example.service';
-import { AdjustConfigComponent } from '../../devices/basic-info/adjust-config/adjust-config.component';
import { DeviceEditComponent } from '../../devices/basic-info/device-edit/device-edit.component';
+import { DeviceControllerService } from '../device-controller/device-controller.service';
@Component({
selector: 'app-device-status',
@@ -35,6 +35,24 @@
{ title: '���������', index: 'operateUser.name' },
{ title: '������������', width: '100px', type: 'date', index: 'createTime' },
{ title: '������������', width: '100px', type: 'date', index: 'installTime' },
+ {
+ title: '���������',
+ buttons: [
+ {
+ text: '������',
+ type: 'none',
+ click: (record: any) => this.addOrModify(record)
+ },
+ {
+ text: '������',
+ type: 'none',
+ click: (record: any) => {
+ this.deviceControllerService.data = record;
+ this.deviceControllerService.incumbent = 'data';
+ }
+ }
+ ]
+ }
];
queryTextStream: Subject<string> = new Subject<string>();
public queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
@@ -50,7 +68,8 @@
private modalHelper: ModalHelper,
private coorPickerService: CoorPickerService,
private organizationService: OrganizationService,
- private http: _HttpClient
+ private http: _HttpClient,
+ private deviceControllerService: DeviceControllerService,
) { }
ngOnInit() {
@@ -158,32 +177,33 @@
if (!!configMap['mpointId'] && !d['monitorPoint']) {
data['monitorPoint'] = this.getMonitorPoint(configMap['mpointId']);
}
- this.modalHelper.static(DeviceEditComponent, { data, configMap }).subscribe(
+ const isEditState = false;
+ this.modalHelper.static(DeviceEditComponent, { data,configMap,isEditState }).subscribe(
(ret: { data: any, close: Function }) => {
- // ������������
- if (ret.data['id'] != null) {
- const origData = d;
- const isModified = Object.keys(ret.data).some(
- (key: string) => {
- return ret.data[key] !== origData[key];
- }
- );
- // ������������
- if (!isModified) {
- ret.close();
- this.msgSrv.success('���������������������������');
- return;
- }
- }
- this.deviceService.save(ret.data).subscribe(
- (res: any) => {
- if (res.code === 1) {
- this.load();
- ret.close();
- this.msgSrv.success('���������������������');
- }
- }
- );
+ // // ������������
+ // if (ret.data['id'] != null) {
+ // const origData = d;
+ // const isModified = Object.keys(ret.data).some(
+ // (key: string) => {
+ // return ret.data[key] !== origData[key];
+ // }
+ // );
+ // // ������������
+ // if (!isModified) {
+ // ret.close();
+ // this.msgSrv.success('���������������������������');
+ // return;
+ // }
+ // }
+ // this.deviceService.save(ret.data).subscribe(
+ // (res: any) => {
+ // if (res.code === 1) {
+ // this.load();
+ // ret.close();
+ // this.msgSrv.success('���������������������');
+ // }
+ // }
+ // );
});
}
private getMonitorPoint(mpointId: number) {
diff --git a/src/app/routes/operation/operation.module.ts b/src/app/routes/operation/operation.module.ts
index e10b5cf..738d9db 100644
--- a/src/app/routes/operation/operation.module.ts
+++ b/src/app/routes/operation/operation.module.ts
@@ -14,9 +14,9 @@
import { FormBuilder } from '@angular/forms';
import { DeviceService } from '@business/services/http/device.service';
import { OperateUserService } from '@business/services/http/operate-user.service';
-import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
-import { MapModule } from 'app/routes/map/map.module';
-import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { CoordinatesPickerComponent } from '../map/coordinates-picker/coordinates-picker.component';
+import { MapModule } from '../map/map.module';
+import { CoorPickerService } from '../map/coordinates-picker/coordinates-picker.service';
import { AdjustConfigComponent } from '../devices/basic-info/adjust-config/adjust-config.component';
import { DeviceEditComponent } from '../devices/basic-info/device-edit/device-edit.component';
import { VersionEditComponent } from '../devices/version/version-edit/version-edit.component';
@@ -28,6 +28,8 @@
import { NgxEchartsModule } from 'ngx-echarts';
import { DeviceMaintenanceComponent } from './device-maintenance/device-maintenance.component';
import { DevicesModule } from '../devices/devices.module';
+import { DeviceDataComponent } from './device-data/device-data.component';
+import { DeviceControllerComponent } from './device-controller/device-controller.component';
const COMPONENTS_NOROUNT = [];
const routes: Routes = [
@@ -36,7 +38,9 @@
children: [
{ path: 'data-audit', component: DataAuditComponent },
{ path: 'device-status', component: DeviceStatusComponent },
- { path: 'device-maintenance', component: DeviceMaintenanceComponent }
+ { path: 'device-maintenance', component: DeviceMaintenanceComponent },
+ { path: 'device-data', component: DeviceDataComponent },
+ { path: 'device-controller', component: DeviceControllerComponent },
]
}
];
@@ -54,10 +58,12 @@
DevicesModule
],
declarations: [
+ ...COMPONENTS_NOROUNT,
DataAuditComponent,
DeviceStatusComponent,
DeviceMaintenanceComponent,
- ...COMPONENTS_NOROUNT
+ DeviceDataComponent,
+ DeviceControllerComponent ,
],
providers: [CoorPickerService, DeviceAdjustValueService, OrganizationService, VersionService,
SensorsService, AreacodeService, MonitorPointService,
diff --git a/src/app/routes/pollution/management/management.component.ts b/src/app/routes/pollution/management/management.component.ts
index 7b6a412..ae25788 100644
--- a/src/app/routes/pollution/management/management.component.ts
+++ b/src/app/routes/pollution/management/management.component.ts
@@ -1,4 +1,4 @@
-import {environment} from '../../../../environments/environment';
+import {environment} from '@env/environment';
import {Component, OnInit, OnDestroy} from '@angular/core';
import {NzMessageService} from 'ng-zorro-antd';
import {_HttpClient} from '@delon/theme';
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 85643f5..01e0a9d 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -1,4 +1,4 @@
-import {environment} from '../../../environments/environment';
+import {environment} from '@env/environment';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {Component, OnInit, Injector} from '@angular/core';
import {HttpClient} from '@angular/common/http';
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index a6d1668..58dce91 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -11,11 +11,11 @@
import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
import { ReportComponent } from './report/report.component';
-import { UserLoginComponent } from 'app/routes/passport/login/login.component';
+import { UserLoginComponent } from './passport/login/login.component';
import { ForecastingWarningComponent } from './forecasting-warning/forecasting-warning.component';
-import { PollutionManagementComponent } from 'app/routes/pollution/management/management.component';
-import { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';
+import { PollutionManagementComponent } from './pollution/management/management.component';
+import { EnvironmentManagementComponent } from './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';
diff --git a/src/app/routes/statistics/calendar/calendar.component.ts b/src/app/routes/statistics/calendar/calendar.component.ts
index 2ba1c98..7054066 100644
--- a/src/app/routes/statistics/calendar/calendar.component.ts
+++ b/src/app/routes/statistics/calendar/calendar.component.ts
@@ -32,7 +32,8 @@
}
ngOnInit() {
- const day = Number(moment().format('DD'));
+ // const day = Number(moment().format('DD'));
+ const day = 31;
for(let index = 1;index <= day; index++) {
this.calendarDayCells[('0'+index).slice(-2)] = {
status: 'processing',
@@ -40,8 +41,11 @@
data: {}
}
}
- const startTime = this.getPeriodDate(new Date(),TimeUnits.DAY,'start');
- const endTime = this.getPeriodDate(new Date(),TimeUnits.HOUR,'end');
+ // const startTime = this.getPeriodDate(new Date(),TimeUnits.DAY,'start');
+ // const endTime = this.getPeriodDate(new Date(),TimeUnits.HOUR,'end');
+ const mo = moment().subtract(1,"months");
+ const startTime = this.getPeriodDate(mo.toDate(),TimeUnits.DAY,'start');
+ const endTime = this.getPeriodDate(mo.toDate(),TimeUnits.DAY,'end');
this.http.get(
'demo/get-dayaqis',{
startTime: startTime,
@@ -50,6 +54,7 @@
).subscribe(
(res: any[]) => {
if(!!res && res.length >0) {
+ debugger;
Object.keys(this.calendarDayCells).forEach(
(key) => {
const index = Number(key) -1;
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 3db3bb1..1edc88b 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -80,7 +80,7 @@
,
{
"text": "������������",
- "link": "/operation/device-status"
+ "link": "/operation/device-controller"
}
,
{
diff --git a/src/main.ts b/src/main.ts
index eac1183..8eb8106 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,10 +1,10 @@
import { enableProdMode, ViewEncapsulation } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
+import { AppModule } from 'app/app.module';
+import { environment } from '@env/environment';
-import { hmrBootstrap } from './hmr';
+import { hmrBootstrap } from 'hmr';
import { preloaderFinished } from '@delon/theme';
preloaderFinished();
diff --git a/src/testing/common.spec.ts b/src/testing/common.spec.ts
index 9aa9b27..833fc29 100644
--- a/src/testing/common.spec.ts
+++ b/src/testing/common.spec.ts
@@ -10,9 +10,9 @@
import { I18NService } from '@core/i18n/i18n.service';
import { CoreModule } from '@core/core.module';
import { SharedModule } from '@shared/shared.module';
-import { DelonModule } from '../app/delon.module';
+import { DelonModule } from 'app/delon.module';
import { AlainAuthModule } from '@delon/auth';
-import { HttpLoaderFactory } from '../app/app.module';
+import { HttpLoaderFactory } from 'app/app.module';
const resetTestingModule = TestBed.resetTestingModule,
preventAngularFromResetting = () => TestBed.resetTestingModule = () => TestBed;
--
Gitblit v1.8.0