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-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-one/delete-one.component.html b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html index 58b9669..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/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts index 2e9057f..48bcdaf 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) @@ -182,6 +181,7 @@ export class DeleteTwoComponent implements OnInit { var dianji:boolean=headtext=="删除数量总统计" ? false:true; var ec = echarts as any; this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp'); +<<<<<<< HEAD this.options = { grid: { top: 50, @@ -199,22 +199,42 @@ export class DeleteTwoComponent implements OnInit { color:'#999', fontWeight:'bold', }, +======= + var options = { + grid: { + top: 50, + left:40, + right: 20, + bottom: 20, + }, + // 标题 + title: { + text: `${headtext}`, + left:'center', + top: -4, + //副标题文本样式 + 　subtextStyle:{ + color:'#999', + fontWeight:'bold', + }, +>>>>>>> b56d7ae0c7cd644e4ed01e4efc5232a7cfdf07d3 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, @@ -240,8 +260,8 @@ export class DeleteTwoComponent implements OnInit { axisLabel: { color: "#000" //刻度线标签颜色 }, - //设置坐标轴字体颜色和宽度 - axisLine: { + //设置坐标轴字体颜色和宽度 + axisLine: { lineStyle: { color: "#000", } @@ -285,7 +305,6 @@ export class DeleteTwoComponent implements OnInit { this.router.navigate(['/statisticanalysis/delete_one/delete_there'],{queryParams:{'level':this.options.xAxis.data[xIndex],'headtext':headtext}}); } } - }); this.headZx.setOption(this.options); } diff --git a/src/app/statistic-analysis/home/home.component.html b/src/app/statistic-analysis/home/home.component.html index 25b8e12..e06e0c6 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 @@
-
-
+
+
计划完成情况
-
+
本年时间进度
@@ -77,8 +77,8 @@
-
-
+
+
三维预案总数
@@ -99,7 +99,7 @@
-
+
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", 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},