From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/business/services/http/organization.service.ts | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/business/services/http/organization.service.ts b/src/app/business/services/http/organization.service.ts
index da161a8..6f3ff0b 100644
--- a/src/app/business/services/http/organization.service.ts
+++ b/src/app/business/services/http/organization.service.ts
@@ -1,4 +1,4 @@
-import { Organization } from '@business/entity/data';
+import { Organization, AlarmConfig } from '@business/entity/data';
import { ExampleService } from '@business/services/util/example.service';
import { _HttpClient } from '@delon/theme';
import { environment } from 'environments/environment';
@@ -6,17 +6,17 @@
import { Injectable } from '@angular/core';
import { equal } from 'assert';
import { Observable } from 'rxjs/Observable';
-import { PageBean } from '@business/entity/grid';
+import { PageBean, ResultBean } from '@business/entity/grid';
@Injectable()
export class OrganizationService {
handle: 'list'|'config' = 'list';
-
+ config: {pageBean: PageBean, resultBean: ResultBean<AlarmConfig>};
data: Organization;
title: '������������'|'������������' = '������������';
private urls = {
- edit: environment.SERVER_BASH_URL + '/organization/page-list',
+ list: environment.SERVER_BASH_URL + '/organization/page-list',
save: environment.SERVER_BASH_URL + '/organization/add-or-modify',
delete: environment.SERVER_BASH_URL + '/organization/delete-by-ids'
};
@@ -32,7 +32,7 @@
}
const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
queryParams: example.getSqlParam(), orderByClause: orderByClause};
- return this.http.get(this.urls.edit, param);
+ return this.http.get(this.urls.list, param);
}
public save(data: any): Observable<any> {
return this.http.post(this.urls.save, data);
--
Gitblit v1.8.0