Browse Source

[预案分析]修改字体大小

master
chenjingyu 4 years ago
parent
commit
5b9cd4e3a0
  1. 10
      angular.json
  2. 4
      src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts
  3. 6
      src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss
  4. 23
      src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts
  5. 32
      src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts
  6. 3
      src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts
  7. 1
      src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
  8. 9
      src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html
  9. 4
      src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss
  10. 3
      src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts
  11. 12
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html
  12. 7
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss
  13. 3
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
  14. 1
      src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts
  15. 35
      src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.html
  16. 33
      src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss
  17. 11
      src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts
  18. 18
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
  19. 4
      src/app/statistic-analysis/echarts-data.service.ts
  20. 10
      src/app/statistic-analysis/scheduled-updates/moreTable.html
  21. 3
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
  22. 33
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
  23. 1
      src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts
  24. 60
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

10
angular.json

@ -35,14 +35,12 @@
"node_modules/echarts/dist/echarts.js", "node_modules/echarts/dist/echarts.js",
"src/assets/mTokenK1/mToken_K1.js", "src/assets/mTokenK1/mToken_K1.js",
"./node_modules/swiper/js/swiper.min.js", "./node_modules/swiper/js/swiper.min.js",
"src/assets/acharts/acharts.min.js", "src/assets/acharts/acharts.min.js",
"src/assets/echarts/echarts.common.min.js", "src/assets/echarts/echarts.common.min.js",
"src/assets/chartstheme/chongqing.js", "src/assets/chartstheme/chongqing.js",
"src/assets/chartstheme/walden.js", "src/assets/chartstheme/walden.js",
"src/assets/chartstheme/westeros.js", "src/assets/chartstheme/westeros.js",
"src/assets/chartstheme/echarts-skin.js" "src/assets/chartstheme/echarts-skin.js"
] ]
}, },
"configurations": { "configurations": {
@ -137,6 +135,10 @@
} }
} }
} }
}}, }
"defaultProject": "anxin119" },
"defaultProject": "anxin119",
"cli": {
"analytics": false
}
} }

4
src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts

@ -54,7 +54,8 @@ export class AddUnitOneComponent implements OnInit {
trigger: 'item', trigger: 'item',
formatter: (params)=>{ formatter: (params)=>{
return this.echartsData.biaogeTishiZhi(params.name) return this.echartsData.biaogeTishiZhi(params.name)
} },
position:this.echartsData.tableTooltipNoShow2
}, },
legend: { legend: {
orient: 'vertical', orient: 'vertical',
@ -79,6 +80,7 @@ export class AddUnitOneComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:18
} }
}, },
}, },

6
src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss

@ -12,7 +12,7 @@
} }
#Line{ #Line{
width: 50%; width: 50%;
height: 420px; height: 550px;
margin: 50px auto; margin: 50px auto;
} }
} }
@ -66,8 +66,8 @@
height: 100%; height: 100%;
overflow: auto; overflow: auto;
#barEchart{ #barEchart{
width: 60%; width: 80%;
height: 350px; height: 550px;
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;

23
src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts

@ -17,7 +17,9 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
buildingTypeName:String buildingTypeName:String
level:String level:String
setTimeoutObj//延时器需要清除 setTimeoutObj//延时器需要清除
qopao
ngOnInit(): void { ngOnInit(): void {
this.qopao=this.serviceData.qipao(this.qopao,this.dateNum,this.zhiNameData)
this.dateInit () this.dateInit ()
this.route.queryParams.subscribe(params => { this.route.queryParams.subscribe(params => {
this.year = params['year']; this.year = params['year'];
@ -83,24 +85,22 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
top: 50, top: 50,
left:40, left:40,
right: 20, right: 20,
bottom: 20, //bottom: 20,
}, },
// 标题 // 标题
title: { title: {
text: this.buildingTypeName + '(' + this.year + ')', text: this.buildingTypeName ,
top: -4, top: -4,
left: 'center', left: 'center',
textStyle:{ textStyle:{
//文字颜色 //文字颜色
color:'#000', color:'#000',
fontSize: 30
} }
}, },
//提示框 //提示框
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
borderWidth:'1',
borderRadius :'0',
formatter: (params)=>{ formatter: (params)=>{
if(params[0].seriesName == "year"){ if(params[0].seriesName == "year"){
return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name) return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name)
@ -115,6 +115,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
type: 'category', type: 'category',
data: this.date, data: this.date,
axisLabel: { axisLabel: {
textStyle:{
fontSize :18,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -135,6 +139,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :18,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -149,6 +157,11 @@ export class AddUnitThreeLineDetailsComponent implements OnInit {
name: 'xxx', name: 'xxx',
type: 'line', type: 'line',
data: this.dateNum, data: this.dateNum,
barWidth :'38',
markPoint: {
symbolSize:[65, 65],
data: this.qopao
},
} }
], ],
}; };

32
src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts

@ -97,15 +97,18 @@ export class AddUnitTwoTimeComponent implements OnInit {
} }
//年或月点击 //年或月点击
dateChange(){ dateChange(){
this.tiaoshiPao=null
this.forArr.forEach(item => { this.forArr.forEach(item => {
item.echart.dispose() item.echart.dispose()
}) })
if(this.selectType == "year"){ if(this.selectType == "year"){
this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum2,this.date2)
this.oneInit(this.date2,this.dateNum2) this.oneInit(this.date2,this.dateNum2)
this.twoInit(this.date2,this.dateNum2,'year') this.twoInit(this.date2,this.dateNum2,'year')
} }
if(this.selectType == "month"){ if(this.selectType == "month"){
this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum,this.date)
this.oneInit(this.date,this.dateNum) this.oneInit(this.date,this.dateNum)
this.twoInit(this.date,this.dateNum,'month') this.twoInit(this.date,this.dateNum,'month')
} }
@ -163,13 +166,13 @@ export class AddUnitTwoTimeComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '新增数量统计', text: '新增数量统计:总数(1012)',
top: -4, top: -4,
left: 'center', left: 'center',
textStyle:{ textStyle:{
//文字颜色 //文字颜色
color:'#000', color:'#000',
fontSize: 22, fontSize: 30,
} }
}, },
//提示框 //提示框
@ -185,6 +188,10 @@ export class AddUnitTwoTimeComponent implements OnInit {
type: 'category', type: 'category',
data: date, data: date,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -205,6 +212,10 @@ export class AddUnitTwoTimeComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -240,16 +251,17 @@ export class AddUnitTwoTimeComponent implements OnInit {
top: 50, top: 50,
left:40, left:40,
right: 20, right: 20,
bottom: 20, //bottom: 20,
}, },
// 标题 // 标题
title: { title: {
text: item.name, text: item.name+':总数(1012)',
top: -4, top: -4,
left: 'center', left: 'center',
textStyle:{ textStyle:{
//文字颜色 //文字颜色
color:'#000', color:'#000',
fontSize:22
} }
}, },
//提示框 //提示框
@ -268,6 +280,10 @@ export class AddUnitTwoTimeComponent implements OnInit {
type: 'category', type: 'category',
data: date, data: date,
axisLabel: { axisLabel: {
textStyle:{
fontSize :16,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -288,6 +304,10 @@ export class AddUnitTwoTimeComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :16,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -318,9 +338,9 @@ export class AddUnitTwoTimeComponent implements OnInit {
/*事件处理代码书写位置*/ /*事件处理代码书写位置*/
// console.log(option.series[0].data[xIndex],option.xAxis.data[xIndex],option.title.text,option.series[0].name) // console.log(option.series[0].data[xIndex],option.xAxis.data[xIndex],option.title.text,option.series[0].name)
if(option.series[0].name == "year"){ if(option.series[0].name == "year"){
this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_lineDetails'],{queryParams:{'year':this.date2[xIndex],'buildingType':option.title.text}}); this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_lineDetails'],{queryParams:{'year':this.date2[xIndex],'buildingType':item.name}});
}else{ }else{
this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'level':'zhidui','time':option.xAxis.data[xIndex],'buildingTpye':option.title.text}}); this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'level':'zhidui','time':option.xAxis.data[xIndex],'buildingTpye':item.name}});
} }
} }

3
src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts

@ -174,7 +174,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
{ {
name: '访问来源', name: '访问来源',
type: 'pie', type: 'pie',
radius: '60%', radius: '70%',
center: ['50%', '60%'], center: ['50%', '60%'],
label:{ label:{
show:true, show:true,
@ -183,6 +183,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:16
} }
}, },
}, },

1
src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts

@ -63,6 +63,7 @@ export class BuildingTypeOneComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:16
} }
}, },
}, },

9
src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html

@ -4,14 +4,15 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-05 13:50:45 * @Date: 2020-09-05 13:50:45
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-09-10 09:15:36 * @LastEditTime: 2020-09-11 14:15:23
--> -->
<div class="box"> <div class="box">
<div class="topbox"> <div class="topbox">
<div class="btnbox"> <div class="btnbox">
<button mat-stroked-button (click)="goBack ()">返回</button> <button mat-stroked-button (click)="reverse()" >反向查询</button>
<!-- <button mat-stroked-button (click)="forward()" style="background-color: #2196f3;color: white;margin-right: 10px;">正向查询</button> <button mat-stroked-button (click)="forward()" [ngClass]="{'selectedBtn': true}"style="margin-right: 20px;">正向查询</button>
-->
</div> </div>
</div> </div>
<div class="echartsbox"> <div class="echartsbox">

4
src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.scss

@ -40,3 +40,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
} }
.selectedBtn{
background-color: #2196f3;
color: white;
}

3
src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts

@ -198,7 +198,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
{ {
name: '访问来源', name: '访问来源',
type: 'pie', type: 'pie',
radius: '60%', radius: '70%',
center: ['50%', '60%'], center: ['50%', '60%'],
label:{ label:{
show:true, show:true,
@ -207,6 +207,7 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:16
} }
}, },
}, },

12
src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.html

@ -1,8 +1,16 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-09-05 13:50:45
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-11 14:16:12
-->
<div class="box"> <div class="box">
<div class="topbox"> <div class="topbox">
<div class="btnbox"> <div class="btnbox">
<button mat-stroked-button (click)="forward()">正向查询</button> <button mat-stroked-button (click)="reverse()"[ngClass]="{'selectedBtn': true}" style="margin-right: 10px;">向查询</button>
<button mat-stroked-button (click)="reverse()" style="background-color:#2196f3;color: white;">反向查询</button> <button mat-stroked-button (click)="forward()"style="margin-right: 20px;">向查询</button>
</div> </div>
</div> </div>
<div class="echartsbox"> <div class="echartsbox">

7
src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.scss

@ -10,8 +10,9 @@
height: 80px; height: 80px;
border-bottom: 1px gray solid; border-bottom: 1px gray solid;
.btnbox{ .btnbox{
margin-top: 20px;
display: flex; display: flex;
flex-direction:column; flex-direction:row-reverse;
float: right; float: right;
justify-content: space-around; justify-content: space-around;
height: 100%; height: 100%;
@ -39,3 +40,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
} }
.selectedBtn{
background-color: #2196f3;
color: white;
}

3
src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts

@ -171,7 +171,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
{ {
name: '访问来源', name: '访问来源',
type: 'pie', type: 'pie',
radius: '60%', radius: '70%',
center: ['50%', '60%'], center: ['50%', '60%'],
label:{ label:{
show:true, show:true,
@ -180,6 +180,7 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:16
} }
}, },
}, },

1
src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts

@ -74,6 +74,7 @@ export class DeleteOneComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:16
} }
}, },

35
src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.html

@ -1,4 +1,12 @@
<div class="box"> <!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-09-07 10:36:33
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-11 10:43:53
-->
<!-- <div class="box">
<div class="header"> <div class="header">
<div class="queryField"> <div class="queryField">
<form #form="ngForm" (ngSubmit)="Submit(form.value)"> <form #form="ngForm" (ngSubmit)="Submit(form.value)">
@ -19,6 +27,31 @@
<div class="echartsbox"> <div class="echartsbox">
<div id="barEchart"> <div id="barEchart">
</div>
</div>
</div> -->
<div class="box">
<div class="header">
<div class="queryField">
<form #form="ngForm" (ngSubmit)="Submit(form.value)">
<span>查询年份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectOneYear" name='selectOneYear'>
<mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<button type="submit" mat-raised-button color="primary">查询</button>
</form>
</div>
<div class="btnbox">
<button mat-stroked-button (click)="goBack()">返回</button>
</div>
</div>
<div class="echartsbox">
<div id="barEchart">
</div> </div>
</div> </div>
</div> </div>

33
src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.scss

@ -1,31 +1,31 @@
.box{ .box{
width: 100%; width: 100%;
height: 100%; height: 92%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
position: relative; //position: relative;
/* .echartsbox{ .echartsbox{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; // overflow: auto;
} }
#Line{ #Line{
width: 50%; width: 50%;
height: 420px; height: 420px;
margin: 50px auto; margin: 50px auto;
} */ }
} }
.publicCss{ .publicCss{
height: 350px; height: 350px;
width: 50%; width: 50%;
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
} }
//头部搜索栏 //头部搜索栏
.header { .header {
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
height: 80px; height: 80px;
min-height: 81px;; min-height: 81px;;
@ -64,14 +64,13 @@
.echartsbox{ .echartsbox{
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; overflow: auto;
// overflow: auto;
#barEchart{ #barEchart{
width: 80%; width: 80%;
height: 50%; height: 550px;
position: absolute; //position: absolute;
left: 50%; left: 50%;
top: 45%; top: 50%;
transform: translate(-50%,-60%); transform: translate(-50%,-50%);
}
} }
}

11
src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts

@ -85,6 +85,11 @@ export class DeleteThereLineDetailsComponent implements OnInit {
console.log(this.tiaoshiPao) console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
//返回
goBack () {
history.go(-1)
//this.echartsData.statefulInspectionToggle = true
}
detailPlanEchart detailPlanEchart
option option
@ -98,7 +103,7 @@ export class DeleteThereLineDetailsComponent implements OnInit {
top: 50, top: 50,
left:40, left:40,
right: 20, right: 20,
bottom: 20, //bottom: 20,
}, },
// 标题 // 标题
title: { title: {
@ -130,7 +135,7 @@ export class DeleteThereLineDetailsComponent implements OnInit {
axisLabel: { axisLabel: {
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
textStyle:{ textStyle:{
fontSize :15, fontSize :18,
color:'#000000' color:'#000000'
} }
}, },
@ -154,7 +159,7 @@ export class DeleteThereLineDetailsComponent implements OnInit {
axisLabel: { axisLabel: {
//color: "#000", //刻度线标签颜色 //color: "#000", //刻度线标签颜色
textStyle:{ textStyle:{
fontSize :15, fontSize :18,
color:'#000000' color:'#000000'
} }
}, },

18
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-02 16:21:18 * @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-09-10 14:31:18 * @LastEditTime: 2020-09-11 14:25:48
*/ */
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -91,6 +91,8 @@ export class DeleteTwoComponent implements OnInit {
selectEndMonth:any = (new Date()).getMonth()+1 //结束月份 selectEndMonth:any = (new Date()).getMonth()+1 //结束月份
//点击月 //点击月
monthClick(){ monthClick(){
this.tiaoshiPao=null
this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.datayuey,this.datayuex)
this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey) this.headZhexian('Line','删除数量总统计',this.datayuex,this.datayuey)
this.headZhexian('leftOne','高层',this.datayuex,this.datayuey) this.headZhexian('leftOne','高层',this.datayuex,this.datayuey)
this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey) this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey)
@ -143,6 +145,8 @@ export class DeleteTwoComponent implements OnInit {
selectEndYear:any = (new Date()).getFullYear() //结束年份 selectEndYear:any = (new Date()).getFullYear() //结束年份
//点击年 //点击年
yearClick(){ yearClick(){
this.tiaoshiPao=null
this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.dataniany,this.datanianx)
this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany) this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany)
this.headZhexian('leftOne','高层',this.datanianx,this.dataniany) this.headZhexian('leftOne','高层',this.datanianx,this.dataniany)
this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany) this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany)
@ -196,7 +200,7 @@ export class DeleteTwoComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: `${headtext}`, text: `${headtext}`+':总数(1024)',
left:'center', left:'center',
top: -4, top: -4,
//副标题文本样式 //副标题文本样式
@ -207,7 +211,7 @@ export class DeleteTwoComponent implements OnInit {
textStyle:{ textStyle:{
//文字颜色 //文字颜色
color:'#000', color:'#000',
fontSize: 22, fontSize:divid=='Line'?30: 22,
} }
}, },
//提示框 //提示框
@ -226,6 +230,10 @@ export class DeleteTwoComponent implements OnInit {
boundaryGap:true, boundaryGap:true,
data: datayuex, data: datayuex,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -244,6 +252,10 @@ export class DeleteTwoComponent implements OnInit {
yAxis: { yAxis: {
type: 'value', type: 'value',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度

4
src/app/statistic-analysis/echarts-data.service.ts

@ -92,8 +92,8 @@ export class EchartsDataService {
{name:"九月",number:"88",zhanbi:"0.8%"}, {name:"九月",number:"88",zhanbi:"0.8%"},
{name:"十月",number:"83",zhanbi:"0.7%"}, {name:"十月",number:"83",zhanbi:"0.7%"},
{name:"十一月",number:"133",zhanbi:"2.1%"}, {name:"十一月",number:"133",zhanbi:"2.1%"},
{name:"十二月",number:"122",zhanbi:"1.6%"}, {name:"十二月",number:"122",zhanbi:"1.6%"}/* ,
{name:"总计",number:"984",zhanbi:"20%"} {name:"总计",number:"984",zhanbi:"20%"} */
] ]
//预案提示框 //预案提示框
planData = [ planData = [

10
src/app/statistic-analysis/scheduled-updates/moreTable.html

@ -1,6 +1,14 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-09-05 08:59:24
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-11 11:07:31
-->
<div class="table"> <div class="table">
<p class="tableHeader">公告</p> <p class="tableHeader">公告</p>
<table mat-table [dataSource]="dataSource"> <table mat-table [dataSource]="dataSource" >
<ng-container matColumnDef="team"> <ng-container matColumnDef="team">
<th mat-header-cell *matHeaderCellDef>支队</th> <th mat-header-cell *matHeaderCellDef>支队</th>

3
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss

@ -21,11 +21,12 @@ table {
} }
} }
.table { .table {
font-size: 30px;
width: 1000px; width: 1000px;
height: 600px; height: 600px;
overflow: auto; overflow: auto;
.tableHeader { .tableHeader {
font-size: 24px; font-size: 30px;
text-align: center; text-align: center;
font-weight: 550; font-weight: 550;
} }

33
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@ -70,6 +70,7 @@ export class ScheduledUpdatesComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize:18
} }
}, },
}}, }},
@ -175,11 +176,11 @@ export class verifiedComponent implements OnInit {
top: 50, top: 50,
left:40, left:40,
right: 20, right: 20,
bottom: 20, //bottom: 20,
}, },
// 标题 // 标题
title: { title: {
text: '已核查', text: '已核查'+'总数:(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
textStyle:{ textStyle:{
@ -206,7 +207,7 @@ export class verifiedComponent implements OnInit {
boundaryGap: false, boundaryGap: false,
axisLabel:{ axisLabel:{
textStyle:{ textStyle:{
fontSize :15, fontSize :18,
color:'#000000' color:'#000000'
} }
@ -228,7 +229,7 @@ export class verifiedComponent implements OnInit {
yAxis: { yAxis: {
type: 'value', type: 'value',
axisLabel: { axisLabel: {
fontSize :13, fontSize :18,
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -258,9 +259,9 @@ export class verifiedComponent implements OnInit {
this.items[index].echart = echarts.init(document.getElementById(this.echartIds[index]), 'skinUpp'); this.items[index].echart = echarts.init(document.getElementById(this.echartIds[index]), 'skinUpp');
var option = { var option = {
title: { title: {
text: element, text: element+'总数:(500)',
top: -4, top: -4,
left: 'center', left: '35%',
textStyle:{ textStyle:{
color:'#000', color:'#000',
fontSize: 30, fontSize: 30,
@ -269,10 +270,13 @@ export class verifiedComponent implements OnInit {
//提示框 //提示框
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
textStyle:{
fontSize :18
}
}, },
legend: { legend: {
data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'],
textStyle: { fontSize :15,color: '#000' } textStyle: { fontSize :16,color: '#000' }
}, },
xAxis: [{ xAxis: [{
axisLabel: { axisLabel: {
@ -523,19 +527,26 @@ export class detailedInformationComponent implements OnInit {
left: 'center', left: 'center',
textStyle:{ textStyle:{
color:'#000', color:'#000',
fontSize: 18, fontSize: 30,
} }
}, },
//提示框 //提示框
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
textStyle:{
fontSize :18
}
}, },
legend: { legend: {
data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'],
textStyle: { color: '#000' } textStyle: { color: '#000',fontSize: 16 }
}, },
xAxis: [{ xAxis: [{
axisLabel: { axisLabel: {
textStyle:{
fontSize :18,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -554,6 +565,10 @@ export class detailedInformationComponent implements OnInit {
}, },
type: 'value', type: 'value',
axisLabel: { axisLabel: {
textStyle:{
fontSize :18,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
formatter: '{value}' formatter: '{value}'
} }

1
src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts

@ -435,6 +435,7 @@ export class PageTwoNameComponent implements OnInit {
rich: { rich: {
d: { d: {
align: 'center', align: 'center',
fontSize :18
} }
}, },
}, },

60
src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@ -196,7 +196,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案统计状态', text: '预案统计状态'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
subtext:'今年', subtext:'今年',
@ -218,6 +218,10 @@ export class echartsComponent implements OnInit {
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
textStyle:{
fontSize :15,
color:'#000000'
},
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
axisLine: { axisLine: {
@ -237,6 +241,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -275,7 +283,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案新增', text: '预案新增'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
bottom: 100, bottom: 100,
@ -298,6 +306,10 @@ export class echartsComponent implements OnInit {
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
textStyle:{
fontSize :15,
color:'#000000'
},
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
axisLine: { axisLine: {
@ -317,6 +329,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -358,7 +374,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案审核通过', text: '预案审核通过'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
bottom: 100, bottom: 100,
@ -380,6 +396,10 @@ export class echartsComponent implements OnInit {
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'],
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -400,6 +420,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -441,7 +465,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案编制', text: '预案编制'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
bottom: 100, bottom: 100,
@ -464,6 +488,10 @@ export class echartsComponent implements OnInit {
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'],
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -484,6 +512,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -526,7 +558,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案审核退回', text: '预案审核退回'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
bottom: 100, bottom: 100,
@ -549,6 +581,10 @@ export class echartsComponent implements OnInit {
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'],
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -569,6 +605,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -611,7 +651,7 @@ export class echartsComponent implements OnInit {
}, },
// 标题 // 标题
title: { title: {
text: '预案审核中', text: '预案审核中'+':总数(1024)',
top: -4, top: -4,
left: 'center', left: 'center',
textStyle:{ textStyle:{
@ -633,6 +673,10 @@ export class echartsComponent implements OnInit {
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'],
boundaryGap: true, boundaryGap: true,
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000", //刻度线标签颜色 color: "#000", //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度
@ -653,6 +697,10 @@ export class echartsComponent implements OnInit {
type: 'value', type: 'value',
name: '个', name: '个',
axisLabel: { axisLabel: {
textStyle:{
fontSize :15,
color:'#000000'
},
color: "#000" //刻度线标签颜色 color: "#000" //刻度线标签颜色
}, },
//设置坐标轴字体颜色和宽度 //设置坐标轴字体颜色和宽度

Loading…
Cancel
Save