-
-
-
+
+
-
计划完成情况
+
本年时间进度
@@ -77,8 +77,8 @@
-
-
+
+
-
三维预案总数
@@ -99,7 +99,7 @@
+
diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.html b/src/app/statistic-analysis/state/page-one/page-one.component.html
index 9ac3386..3332b70 100644
--- a/src/app/statistic-analysis/state/page-one/page-one.component.html
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.html
@@ -9,7 +9,7 @@
-
+
diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts
index 653e7d5..d477ca4 100644
--- a/src/app/statistic-analysis/state/page-one/page-one.component.ts
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts
@@ -79,7 +79,7 @@ export class PageOneComponent implements OnInit {
show:true,
// position: 'inner',
// fontSize:18,
- formatter:'{b} {c}\n{d|({d}%)}'
+ formatter:'{b} {c}\n({d}%)',
},
rich: {
d: {
@@ -106,7 +106,7 @@ export class PageOneComponent implements OnInit {
]
};
this.indexBzt.on('click', (params) => {
- this.router.navigateByUrl('/statisticanalysis/statePageTwo_time');
+ this.router.navigateByUrl('/statisticanalysis/statePageOne/time');
});
this.indexBzt.setOption(options);
}
diff --git a/src/app/statistic-analysis/statistic-analysis-routing.module.ts b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
index 7869b49..70c98ad 100644
--- a/src/app/statistic-analysis/statistic-analysis-routing.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis-routing.module.ts
@@ -17,7 +17,6 @@ import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component
import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
-import { from } from 'rxjs';
import {ScheduledUpdatesComponent,publicEchartsComponent} from './scheduled-updates/scheduled-updates.component'
import { BuildingTypeTwoForwardComponent } from './buildingType/building-type-two-forward/building-type-two-forward.component';
import { BuildingTypeTwoReverseComponent } from './buildingType/building-type-two-reverse/building-type-two-reverse.component';
@@ -33,13 +32,12 @@ import { HomeComponent } from './home/home.component';
const routes: Routes = [
{ path: 'statePageOne', component: PageOneComponent},
- { path: 'statePageTwo_time', component: PageTwoTimeComponent},
+ { path: 'statePageOne/time', component: PageTwoTimeComponent},
{ path: 'delete_one', component: DeleteOneComponent},
{ path: 'delete_one/delete_two', component: DeleteTwoComponent},
{ path: 'delete_one/delete_there', component: DeleteThereComponent},
{ path: 'delete_one/delete_four', component: DeleteFourComponent},
{ path: 'buildingType_one', component: BuildingTypeOneComponent},
- //{ path: 'delete_one/deleteUnit_two_type', component: DeleteTwoComponent}
{ path: 'delete_two', component: DeleteTwoComponent},
{ path: 'delete_there', component: DeleteThereComponent},
{ path: 'delete_four', component: DeleteFourComponent},