diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts index 856aede2..2d6bb8cd 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -27,7 +27,7 @@ const alainConfig: AlainConfig = { 'https://gw.alipayobjects.com/os/lib/antv/g2/4.1.4/dist/g2.min.js', 'https://gw.alipayobjects.com/os/lib/antv/data-set/0.11.7/dist/data-set.js' ] - } + }, }; const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()]; diff --git a/src/app/routes/datatable/dataindex/dataindex.component.html b/src/app/routes/datatable/dataindex/dataindex.component.html new file mode 100644 index 00000000..ffa275ac --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.html @@ -0,0 +1,32 @@ + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
diff --git a/src/app/routes/datatable/dataindex/dataindex.component.less b/src/app/routes/datatable/dataindex/dataindex.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/dataindex/dataindex.component.spec.ts b/src/app/routes/datatable/dataindex/dataindex.component.spec.ts new file mode 100644 index 00000000..cd009e56 --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableDataindexComponent } from './dataindex.component'; + +describe('DatatableDataindexComponent', () => { + let component: DatatableDataindexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableDataindexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableDataindexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/dataindex/dataindex.component.ts b/src/app/routes/datatable/dataindex/dataindex.component.ts new file mode 100644 index 00000000..b180b8a5 --- /dev/null +++ b/src/app/routes/datatable/dataindex/dataindex.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; +import { format } from 'date-fns'; + +@Component({ + selector: 'app-datatable-dataindex', + templateUrl: './dataindex.component.html', + styleUrls: ['./dataindex.component.less'] +}) +export class DatatableDataindexComponent implements OnInit { + visitData = this.genData(); + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + private genData(): G2MiniAreaData[] { + const beginDay = new Date().getTime(); + const res: G2MiniAreaData[] = []; + for (let i = 0; i < 20; i += 1) { + res.push({ + x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'), + y: Math.floor(Math.random() * 100) + 10, + }); + } + return res; + } + + refresh(): void { + this.visitData = this.genData(); + } + + handleClick(data: G2MiniAreaClickItem): void { + //this.msg.info(`${data.item.x} - ${data.item.y}`); + } + +} diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts new file mode 100644 index 00000000..76a62af8 --- /dev/null +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { DatatableDataindexComponent } from './dataindex/dataindex.component'; + +const routes: Routes = [ + + { path: 'dataindex', component: DatatableDataindexComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class DatatableRoutingModule { } diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts new file mode 100644 index 00000000..f996d3b5 --- /dev/null +++ b/src/app/routes/datatable/datatable.module.ts @@ -0,0 +1,17 @@ +import { NgModule, Type } from '@angular/core'; +import { SharedModule, SHARED_G2_MODULES } from '@shared'; +import { DatatableRoutingModule } from './datatable-routing.module'; +import { DatatableDataindexComponent } from './dataindex/dataindex.component'; + +const COMPONENTS: Type[] = [ + DatatableDataindexComponent]; + +@NgModule({ + imports: [ + SharedModule, + DatatableRoutingModule, + SHARED_G2_MODULES + ], + declarations: COMPONENTS, +}) +export class DatatableModule { } diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 1ec46449..f8daf42a 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -74,8 +74,8 @@ const routes: Routes = [ { path: 'download', loadChildren: () => import('./download/download.module').then(m => m.DownloadModule) - } - ] + }, + { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },] }, // passport { @@ -100,4 +100,4 @@ const routes: Routes = [ ], exports: [RouterModule] }) -export class RouteRoutingModule {} +export class RouteRoutingModule { } diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index 107bdbd2..ce6e942a 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -49,7 +49,8 @@ export class ShowServiceComponent implements OnInit { return this.service.request(this.service.$api_getStaffList, params).pipe( map((res: any) => { return res.map((i: any) => { - return { label: i.name, value: i.appUserId }; + let name = i.name ? `${i.name} / ` : ''; + return { label: `${name}${i.telephone}`, value: i.appUserId }; }); }), ); diff --git a/src/app/shared/shared-g2.module.ts b/src/app/shared/shared-g2.module.ts index 685f05bc..93863e08 100644 --- a/src/app/shared/shared-g2.module.ts +++ b/src/app/shared/shared-g2.module.ts @@ -2,5 +2,7 @@ import { G2BarModule } from '@delon/chart/bar'; import { G2MiniAreaModule } from '@delon/chart/mini-area'; import { G2PieModule } from '@delon/chart/pie'; import { G2TimelineModule } from '@delon/chart/timeline'; +import { G2CardModule } from '@delon/chart/card'; -export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule]; + +export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule, G2CardModule];