-
-
-
+
+
-
计划完成情况
+
本年时间进度
@@ -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 5e095949fc041867d4dbc412b5ea45ccb9af031f Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 5 Sep 2020 16:44:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E5=81=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/statistic-analysis/home/home.component.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts
index 03439ce..e1e0bb6 100644
--- a/src/app/statistic-analysis/home/home.component.ts
+++ b/src/app/statistic-analysis/home/home.component.ts
@@ -398,7 +398,7 @@ export class HomeComponent implements OnInit {
// x轴
xAxis: {
type: 'category',
- data: [],
+ data: ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"],
axisLabel: {
interval: 0,
@@ -439,7 +439,7 @@ export class HomeComponent implements OnInit {
{
name: '新增单位',
type: 'bar',
- data: [320, 302, 301, 234, 390, 330, 320, 390, 330, 320, 390, 301, 234, 390, 330, 320, 390, ],
+ data: [320, 302, 301, 234, 390, 330, 320, 390, 330, 320, 390, 301, 234, 390 ],
label: {
show: false,
position: "top",
@@ -466,7 +466,7 @@ export class HomeComponent implements OnInit {
}, {
name: '删除单位',
type: 'bar',
- data: [300, 202, 101, 134, 290, 430, 220, 490, 430, 490, 430, 202, 101, 134, 290, 430, 220, ],
+ data: [300, 202, 101, 134, 290, 430, 220, 490, 430, 490, 430, 202, 101, 134 ],
label: {
show: false,
position: "top",
@@ -519,7 +519,7 @@ export class HomeComponent implements OnInit {
// x轴
xAxis: {
type: 'category',
- data: [],
+ data: ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"],
axisLabel: {
interval: 0,
@@ -560,7 +560,7 @@ export class HomeComponent implements OnInit {
{
name: '新增单位',
type: 'bar',
- data: [88, 45, 95, 105, 75, 89, 69, 110, 96, 90, 80, 78, 94, 102, 94, 86, 77, ],
+ data: [88, 45, 95, 105, 75, 89, 69, 110, 96, 90, 80, 78, 94, 102],
label: {
show: false,
position: "top",
@@ -587,7 +587,7 @@ export class HomeComponent implements OnInit {
}, {
name: '删除单位',
type: 'bar',
- data: [35, 33, 27, 30, 35, 36, 28, 32, 36, 22, 19, 28, 34, 36, 37, 30, 29, ],
+ data: [35, 33, 27, 30, 35, 36, 28, 32, 36, 22, 19, 28, 34, 36],
label: {
show: false,
position: "top",
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 3/4] =?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: {
From e93f9a8ce041d800b0eaba52f060bcebee2cb070 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 5 Sep 2020 16:55:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]echarts=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../delete-four/delete-four.component.scss | 2 +-
.../delete-two/delete-two.component.ts | 65 +++++++++----------
2 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
index 1e25505..cde1652 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.scss
@@ -8,6 +8,6 @@
position: absolute;
left: 50%;
top: 45%;
- transform: translate(-50%,-50%);
+ transform: translate(-50%,-60%);
}
}
\ No newline at end of file
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
index 4800c33..b3de526 100644
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
@@ -32,10 +32,9 @@ export class DeleteTwoComponent implements OnInit {
ngOnInit(): void {
this.dateInit()
- this.echartsData.tableTooltipNoShow2
+
window.setTimeout(()=>{
- console.log(this.selectType)
-
+
this.headZhexian('heads','删除数量总统计',this.datayuex,this.datayuey)
this.headZhexian('leftOne','高层',this.datayuex,this.datayuey)
this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey)
@@ -159,38 +158,39 @@ export class DeleteTwoComponent implements OnInit {
var ec = echarts as any;
this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp');
var options = {
- grid: {
- top: 50,
- left:40,
- right: 20,
- bottom: 20,
- },
- // 标题
- title: {
- text: `${headtext}`,
- left:'center',
- top: -4,
- //副标题文本样式
- subtextStyle:{
- color:'#999',
- fontWeight:'bold',
- },
+ grid: {
+ top: 50,
+ left:40,
+ right: 20,
+ bottom: 20,
+ },
+ // 标题
+ title: {
+ text: `${headtext}`,
+ left:'center',
+ top: -4,
+ //副标题文本样式
+ subtextStyle:{
+ color:'#999',
+ fontWeight:'bold',
+ },
textStyle:{
//文字颜色
color:'#000',
fontSize: 22,
}
- },
- //提示框
- tooltip: {
- trigger: 'axis',
- formatter: (params)=>{
- return this.biaogeTishi(`${headtext}`)
- } ,
- backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
- borderWidth:'1',
- borderRadius :'0'
- },
+ },
+ //提示框
+ tooltip: {
+ trigger: 'axis',
+ formatter: (params)=>{
+ return this.biaogeTishi(`${headtext}`)
+ },
+ backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+ borderWidth:'1',
+ borderRadius :'0',
+ position: this.echartsData.tableTooltipNoShow
+ },
xAxis: {
type: 'category',
boundaryGap:true,
@@ -216,8 +216,8 @@ export class DeleteTwoComponent implements OnInit {
axisLabel: {
color: "#000" //刻度线标签颜色
},
- //设置坐标轴字体颜色和宽度
- axisLine: {
+ //设置坐标轴字体颜色和宽度
+ axisLine: {
lineStyle: {
color: "#000",
}
@@ -254,7 +254,6 @@ export class DeleteTwoComponent implements OnInit {
this.echartsData.statefulInspectionName =params.name+headtext;
this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`);
}
-
});
this.headZx.setOption(options);
}