From e0ce7cdd8d759fed6676dde6a721d9207406be66 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Sat, 5 Sep 2020 16:33:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=A6=96=E9=A1=B5,?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=20=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add-unit-one/add-unit-one.component.html | 2 +- .../building-type-one.component.html | 2 +- .../delete-one/delete-one.component.html | 2 +- .../statistic-analysis/home/home.component.html | 14 +++++++------- .../state/page-one/page-one.component.html | 2 +- .../state/page-one/page-one.component.ts | 2 +- .../statistic-analysis-routing.module.ts | 4 +--- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html index b560d1b..744683f 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html @@ -1,4 +1,4 @@ -
+
\ No newline at end of file diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html index b560d1b..744683f 100644 --- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html +++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html @@ -1,4 +1,4 @@ -
+
\ No newline at end of file diff --git a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html index f109d8c..ebe06cc 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html +++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html @@ -6,4 +6,4 @@ * @LastEditors: sueRimn * @LastEditTime: 2020-09-05 11:28:26 --> -
+
diff --git a/src/app/statistic-analysis/home/home.component.html b/src/app/statistic-analysis/home/home.component.html index 7aed1e6..f660c25 100644 --- a/src/app/statistic-analysis/home/home.component.html +++ b/src/app/statistic-analysis/home/home.component.html @@ -2,7 +2,7 @@
-
+
@@ -10,11 +10,11 @@
-
-
+
+
计划完成情况
-
+
本年时间进度
@@ -80,8 +80,8 @@
-
-
+
+
三维预案总数
@@ -102,7 +102,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 781f3f7..96608b0 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 @@ -102,7 +102,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}, From 9a45edde51d171ca6207dbfacf052d85ff0d9614 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Sat, 5 Sep 2020 16:44:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20echarts=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/statistic-analysis/state/page-one/page-one.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 07eca75..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: {