diff --git a/angular.json b/angular.json index b09f8df..bdb98a9 100644 --- a/angular.json +++ b/angular.json @@ -35,14 +35,12 @@ "node_modules/echarts/dist/echarts.js", "src/assets/mTokenK1/mToken_K1.js", "./node_modules/swiper/js/swiper.min.js", - "src/assets/acharts/acharts.min.js", "src/assets/echarts/echarts.common.min.js", "src/assets/chartstheme/chongqing.js", "src/assets/chartstheme/walden.js", "src/assets/chartstheme/westeros.js", "src/assets/chartstheme/echarts-skin.js" - ] }, "configurations": { @@ -80,7 +78,7 @@ "builder": "@angular-devkit/build-angular:dev-server", "options": { "browserTarget": "anxin119:build", - "proxyConfig": "proxy.config.json" + "proxyConfig": "proxy.config.json" }, "configurations": { "production": { @@ -137,6 +135,10 @@ } } } - }}, - "defaultProject": "anxin119" + } + }, + "defaultProject": "anxin119", + "cli": { + "analytics": false + } } \ No newline at end of file diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index fc11226..e009421 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -54,7 +54,8 @@ export class AddUnitOneComponent implements OnInit { trigger: 'item', formatter: (params)=>{ return this.echartsData.biaogeTishiZhi(params.name) - } + }, + position:this.echartsData.tableTooltipNoShow2 }, legend: { orient: 'vertical', @@ -79,6 +80,7 @@ export class AddUnitOneComponent implements OnInit { rich: { d: { align: 'center', + fontSize:18 } }, }, diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss index febdae8..3140fa4 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss +++ b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.scss @@ -12,7 +12,7 @@ } #Line{ width: 50%; - height: 420px; + height: 550px; margin: 50px auto; } } @@ -66,8 +66,8 @@ height: 100%; overflow: auto; #barEchart{ - width: 60%; - height: 350px; + width: 80%; + height: 550px; position: absolute; left: 50%; top: 50%; diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts index fd5110e..af2ba8a 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts +++ b/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 level:String setTimeoutObj//延时器需要清除 + qopao ngOnInit(): void { + this.qopao=this.serviceData.qipao(this.qopao,this.dateNum,this.zhiNameData) this.dateInit () this.route.queryParams.subscribe(params => { this.year = params['year']; @@ -83,24 +85,22 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { top: 50, left:40, right: 20, - bottom: 20, + //bottom: 20, }, // 标题 title: { - text: this.buildingTypeName + '(' + this.year + ')', + text: this.buildingTypeName , top: -4, left: 'center', textStyle:{ //文字颜色 color:'#000', + fontSize: 30 } }, //提示框 tooltip: { trigger: 'axis', - backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度 - borderWidth:'1', - borderRadius :'0', formatter: (params)=>{ if(params[0].seriesName == "year"){ return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name) @@ -115,6 +115,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { type: 'category', data: this.date, axisLabel: { + textStyle:{ + fontSize :18, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -135,6 +139,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :18, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -149,6 +157,11 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { name: 'xxx', type: 'line', data: this.dateNum, + barWidth :'38', + markPoint: { + symbolSize:[65, 65], + data: this.qopao + }, } ], }; diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts index d8ea4f9..fd8b71f 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts +++ b/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(){ + this.tiaoshiPao=null this.forArr.forEach(item => { item.echart.dispose() }) if(this.selectType == "year"){ + this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum2,this.date2) this.oneInit(this.date2,this.dateNum2) this.twoInit(this.date2,this.dateNum2,'year') } if(this.selectType == "month"){ + this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum,this.date) this.oneInit(this.date,this.dateNum) this.twoInit(this.date,this.dateNum,'month') } @@ -163,13 +166,13 @@ export class AddUnitTwoTimeComponent implements OnInit { }, // 标题 title: { - text: '新增数量统计', + text: '新增数量统计:总数(1012)', top: -4, left: 'center', textStyle:{ //文字颜色 color:'#000', - fontSize: 22, + fontSize: 30, } }, //提示框 @@ -185,6 +188,10 @@ export class AddUnitTwoTimeComponent implements OnInit { type: 'category', data: date, axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -205,6 +212,10 @@ export class AddUnitTwoTimeComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -240,16 +251,17 @@ export class AddUnitTwoTimeComponent implements OnInit { top: 50, left:40, right: 20, - bottom: 20, + //bottom: 20, }, // 标题 title: { - text: item.name, + text: item.name+':总数(1012)', top: -4, left: 'center', textStyle:{ //文字颜色 color:'#000', + fontSize:22 } }, //提示框 @@ -268,6 +280,10 @@ export class AddUnitTwoTimeComponent implements OnInit { type: 'category', data: date, axisLabel: { + textStyle:{ + fontSize :16, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -288,6 +304,10 @@ export class AddUnitTwoTimeComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :16, + color:'#000000' + }, 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) 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{ - 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}}); } } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index e1ae705..d9781fd 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/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: '访问来源', type: 'pie', - radius: '60%', + radius: '70%', center: ['50%', '60%'], label:{ show:true, @@ -183,6 +183,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { rich: { d: { align: 'center', + fontSize:16 } }, }, diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts index 53e4bfa..26e2316 100644 --- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts @@ -63,6 +63,7 @@ export class BuildingTypeOneComponent implements OnInit { rich: { d: { align: 'center', + fontSize:16 } }, }, diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html index 3678117..4c1d614 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html +++ b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.html @@ -4,14 +4,15 @@ * @Author: sueRimn * @Date: 2020-09-05 13:50:45 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-10 09:15:36 + * @LastEditTime: 2020-09-11 14:15:23 -->
公告
-支队 | diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss index 7a94345..f299917 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss @@ -21,11 +21,12 @@ table { } } .table { + font-size: 30px; width: 1000px; height: 600px; overflow: auto; .tableHeader { - font-size: 24px; + font-size: 30px; text-align: center; font-weight: 550; } diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts index f62680e..a6aeccc 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -70,6 +70,7 @@ export class ScheduledUpdatesComponent implements OnInit { rich: { d: { align: 'center', + fontSize:18 } }, }}, @@ -175,11 +176,11 @@ export class verifiedComponent implements OnInit { top: 50, left:40, right: 20, - bottom: 20, + //bottom: 20, }, // 标题 title: { - text: '已核查', + text: '已核查'+'总数:(1024)', top: -4, left: 'center', textStyle:{ @@ -206,7 +207,7 @@ export class verifiedComponent implements OnInit { boundaryGap: false, axisLabel:{ textStyle:{ - fontSize :15, + fontSize :18, color:'#000000' } @@ -228,7 +229,7 @@ export class verifiedComponent implements OnInit { yAxis: { type: 'value', axisLabel: { - fontSize :13, + fontSize :18, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -258,9 +259,9 @@ export class verifiedComponent implements OnInit { this.items[index].echart = echarts.init(document.getElementById(this.echartIds[index]), 'skinUpp'); var option = { title: { - text: element, + text: element+'总数:(500)', top: -4, - left: 'center', + left: '35%', textStyle:{ color:'#000', fontSize: 30, @@ -269,10 +270,13 @@ export class verifiedComponent implements OnInit { //提示框 tooltip: { trigger: 'axis', + textStyle:{ + fontSize :18 + } }, legend: { data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], - textStyle: { fontSize :15,color: '#000' } + textStyle: { fontSize :16,color: '#000' } }, xAxis: [{ axisLabel: { @@ -523,19 +527,26 @@ export class detailedInformationComponent implements OnInit { left: 'center', textStyle:{ color:'#000', - fontSize: 18, + fontSize: 30, } }, //提示框 tooltip: { trigger: 'axis', + textStyle:{ + fontSize :18 + } }, legend: { data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'], - textStyle: { color: '#000' } + textStyle: { color: '#000',fontSize: 16 } }, xAxis: [{ axisLabel: { + textStyle:{ + fontSize :18, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -554,6 +565,10 @@ export class detailedInformationComponent implements OnInit { }, type: 'value', axisLabel: { + textStyle:{ + fontSize :18, + color:'#000000' + }, color: "#000", //刻度线标签颜色 formatter: '{value}' } diff --git a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts index 2c8869a..18df1ca 100644 --- a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts +++ b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts @@ -435,6 +435,7 @@ export class PageTwoNameComponent implements OnInit { rich: { d: { align: 'center', + fontSize :18 } }, }, diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts index 384b231..8197339 100644 --- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts +++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts @@ -196,7 +196,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案统计状态', + text: '预案统计状态'+':总数(1024)', top: -4, left: 'center', subtext:'今年', @@ -218,6 +218,10 @@ export class echartsComponent implements OnInit { boundaryGap: true, axisLabel: { color: "#000", //刻度线标签颜色 + textStyle:{ + fontSize :15, + color:'#000000' + }, }, //设置坐标轴字体颜色和宽度 axisLine: { @@ -237,6 +241,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -275,7 +283,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案新增', + text: '预案新增'+':总数(1024)', top: -4, left: 'center', bottom: 100, @@ -298,6 +306,10 @@ export class echartsComponent implements OnInit { boundaryGap: true, axisLabel: { color: "#000", //刻度线标签颜色 + textStyle:{ + fontSize :15, + color:'#000000' + }, }, //设置坐标轴字体颜色和宽度 axisLine: { @@ -317,6 +329,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -358,7 +374,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案审核通过', + text: '预案审核通过'+':总数(1024)', top: -4, left: 'center', bottom: 100, @@ -380,6 +396,10 @@ export class echartsComponent implements OnInit { data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], boundaryGap: true, axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -400,6 +420,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -441,7 +465,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案编制', + text: '预案编制'+':总数(1024)', top: -4, left: 'center', bottom: 100, @@ -464,6 +488,10 @@ export class echartsComponent implements OnInit { data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], boundaryGap: true, axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -484,6 +512,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -526,7 +558,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案审核退回', + text: '预案审核退回'+':总数(1024)', top: -4, left: 'center', bottom: 100, @@ -549,6 +581,10 @@ export class echartsComponent implements OnInit { data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], boundaryGap: true, axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -569,6 +605,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -611,7 +651,7 @@ export class echartsComponent implements OnInit { }, // 标题 title: { - text: '预案审核中', + text: '预案审核中'+':总数(1024)', top: -4, left: 'center', textStyle:{ @@ -633,6 +673,10 @@ export class echartsComponent implements OnInit { data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'], boundaryGap: true, axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000", //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度 @@ -653,6 +697,10 @@ export class echartsComponent implements OnInit { type: 'value', name: '个', axisLabel: { + textStyle:{ + fontSize :15, + color:'#000000' + }, color: "#000" //刻度线标签颜色 }, //设置坐标轴字体颜色和宽度
---|