-แก้ไขโครงสร้าง dashboard
This commit is contained in:
@@ -22,13 +22,13 @@ const routes: Routes = [
|
||||
(m) => m.MainControlModule
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'report',
|
||||
loadChildren: () =>
|
||||
import('./controls/report-control/report-control.module').then(
|
||||
(m) => m.ReportControlModule
|
||||
),
|
||||
},
|
||||
// {
|
||||
// path: 'report',
|
||||
// loadChildren: () =>
|
||||
// import('./controls/report-control/report-control.module').then(
|
||||
// (m) => m.ReportControlModule
|
||||
// ),
|
||||
// },
|
||||
],
|
||||
},
|
||||
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
<div class="pie-chart" [style.background]="ActSumDataGradient">
|
||||
<div class="pie-chart__center">
|
||||
<p>รวมเดือนนี้</p>
|
||||
<strong>฿732K</strong>
|
||||
<strong>{{myActSumData.summary.totalExpense}}</strong>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="pie-legend">
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { MainDashboardContentComponent } from '../../content/main-dashboard-content/main-dashboard-content.component';
|
||||
import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
// import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
|
||||
|
||||
|
||||
const routes: Routes = [
|
||||
{ path: 'dashboard', component: MainDashboardContentComponent },
|
||||
{ path: 'report', component: MainReportComponent },
|
||||
// children: [
|
||||
// {
|
||||
// path: 'dashboard',
|
||||
|
||||
@@ -9,6 +9,7 @@ import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { MainDashboardComponent } from '../../component/main-dashboard/main-dashboard.component';
|
||||
import { MainDashboardContentComponent } from '../../content/main-dashboard-content/main-dashboard-content.component';
|
||||
import { AccDateFormatPipe } from '../../pipe/dtmtodatetime.pipe';
|
||||
import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
|
||||
// import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
|
||||
@@ -18,6 +19,7 @@ import { AccDateFormatPipe } from '../../pipe/dtmtodatetime.pipe';
|
||||
declarations: [
|
||||
MainDashboardComponent,
|
||||
MainDashboardContentComponent,
|
||||
MainReportComponent,
|
||||
AccDateFormatPipe
|
||||
// MainReportComponent
|
||||
],
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: MainReportComponent
|
||||
}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class ReportControlRoutingModule { }
|
||||
@@ -1,18 +0,0 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { MainReportComponent } from '../../component/main-report/main-report.component';
|
||||
import { ReportControlRoutingModule } from './report-control-routing.module';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
MainReportComponent
|
||||
],
|
||||
imports: [
|
||||
CommonModule,
|
||||
ReportControlRoutingModule,
|
||||
ReactiveFormsModule
|
||||
]
|
||||
})
|
||||
export class ReportControlModule { }
|
||||
Reference in New Issue
Block a user