[综合分析]页面修改字体和图标位置

4 years ago · 3c9d3853b3
11 changed files with 70 additions and 30 deletions
--- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.html
+++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.html
@ -4,13 +4,14 @@
 * @Author: sueRimn
 * @Date: 2020-09-05 13:50:45
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 08:56:11
+ * @LastEditTime: 2020-09-11 16:51:57
 -->
 <div class="box">
    <div class="topbox">
        <div class="btnbox">
-            <button mat-stroked-button (click)="forward()" [ngClass]="{'selectedBtn': url == '/statisticanalysis/addUnit_one/addUnit_two_type'}" >类型统计</button>
-            <button mat-stroked-button (click)="reverse()" [ngClass]="{'selectedBtn': url == '/statisticanalysis/addUnit_one/addUnit_two_time'}"style="margin-right: 30px;">区间选择</button>
+            <button mat-stroked-button (click)="reverse()" [ngClass]="{'selectedBtn': url == '/statisticanalysis/addUnit_one/addUnit_two_time'}">区间选择</button>
+            <button mat-stroked-button (click)="forward()" [ngClass]="{'selectedBtn': url == '/statisticanalysis/addUnit_one/addUnit_two_type'}" style="margin-right: 30px;">类型统计</button>
+            
        </div>
    </div>
    <div class="echartsbox">
--- 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
@ -156,7 +156,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
      tooltip: {
        trigger: 'item',
        formatter:  (params)=>{
-          return this.tableTooltip(this.tableDataZhi,params.name)
+          return this.data.biaogeTishiZhi(params.name)
        },
        position: this.data.tableTooltipNoShow2
      },
--- 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
@ -58,12 +58,12 @@ export class BuildingTypeOneComponent implements OnInit {
          center: ['50%', '53%'],
          label:{
            show:true,
-            fontSize:16,
+            fontSize:18,
            formatter:'{b}{c}家\n{d|({d}%)}',
            rich: {
              d: {
                align: 'center',
-                fontSize:16
+                fontSize:18
              }
            },
          },
--- a/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts
@ -69,12 +69,12 @@ export class DeleteOneComponent implements OnInit {
              center: ['50%', '60%'],
              label:{
                show:true,
-            fontSize:16,
+            fontSize:18,
            formatter:'{b}{c}家\n{d|({d}%)}',
            rich: {
              d: {
                align: 'center',
-                fontSize:16
+                fontSize:18
              }
            },
                
--- a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts
@ -188,7 +188,7 @@ export class DeleteThereLineDetailsComponent implements OnInit {
      if (this.detailPlanEchart.containPixel('grid',pointInPixel)) {
        let xIndex=this.detailPlanEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
        /*事件处理代码书写位置*/
-        this.router.navigate(['/statisticanalysis/delete_one/delete_there'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':this.buildingTypeName}});
+        this.router.navigate(['/statisticanalysis/delete_one/delete_there'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':this.buildingTypeName,'zhong':'1'}});
      }
    });
  }
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:22:35
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-10 14:33:07
+ * @LastEditTime: 2020-09-11 17:13:40
 */
 import { Component, OnInit } from '@angular/core';
 import { Router,ActivatedRoute } from '@angular/router';
@ -27,6 +27,7 @@ export class DeleteThereComponent implements OnInit {
  buildingTypeName:String
  setTimeoutObj//延时器需要清除
  headtext:string;
+  zhong:string
  ngOnDestroy():void{
    this.zhutu.clear()
    this.zhutu.dispose()
@ -43,6 +44,7 @@ export class DeleteThereComponent implements OnInit {
    this.activatedRoute.queryParams.subscribe(param=>{
      this.headtext=param.headtext
      datayuex=param.level
+      this.zhong=param.zhong
      headName=this.headtext+''+datayuex;
      //console.log(headName)
    }); 
@ -86,6 +88,7 @@ export class DeleteThereComponent implements OnInit {
  }//柱状图数值顶部显示
  zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
  zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
+  zhongNameData = ["浦东中队","黄埔中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"]
  tiaoshiPao:any
  //气泡提示数据获取
  bianli(){
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:21:18
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-11 14:25:48
+ * @LastEditTime: 2020-09-11 16:42:00
 */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
@ -154,6 +154,7 @@ export class verifiedComponent implements OnInit {

  ngOnInit(): void {
    window.setTimeout(()=>{
+      this.qipaotishi=this.echartsData.qipao(this.qipaotishi,this.ydata,this.xdata)
      this.oneInit()
      this.twoInit()
    },0)
@ -169,6 +170,9 @@ export class verifiedComponent implements OnInit {
  }

  oneEcharts:any;
+  qipaotishi
+  xdata=['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月','10月','11月','12月']
+  ydata=[1170, 953, 1144, 799, 789, 773, 660, 998, 790, 1004, 1345, 1245]
  oneInit () {
    this.oneEcharts = echarts.init(document.getElementById('center'),'walden');
    var option = {
@ -203,8 +207,8 @@ export class verifiedComponent implements OnInit {
      // x轴
      xAxis: {
        type: 'category',
+        boundaryGap:true,
        data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月','10月','11月','12月'],
-        boundaryGap: false,
        axisLabel:{
          textStyle:{
            fontSize :18,
@ -243,7 +247,13 @@ export class verifiedComponent implements OnInit {
      series: [{
          name: '单位预案编制数量',
          type: 'line',
+          markPoint: {
+            
+            symbolSize:[65, 65],
+            data: this.qipaotishi
+        },
          data: [1170, 953, 1144, 799, 789, 773, 660, 998, 790, 1004, 1345, 1245],
+          clickable:false,
        }
      ],
    };
@ -410,31 +420,38 @@ export class notVerifiedComponent implements OnInit {
  oneInit () {
    this.oneEcharts = echarts.init(document.getElementById('center'), 'skinUpp');
    var option = {
+      grid: {
+        left:70
+      },
      title: {
        text: '未核查',
        subtext: '总数剩余 5850',
        left: 'center',
        textStyle:{
          color:'#000',
-          fontSize: 22,
+          fontSize: 30,
        },
-        subtextStyle: {color:'#999',} 
+        subtextStyle: {color:'#999',fontSize: 15} 
      },
      tooltip: {
        trigger: 'axis',
        formatter:  (params)=>{
          return this.echartsData.tableTooltip(this.echartsData.tableDataZhi,'未核查')
-        },
-        position:this.echartsData.tableTooltipNoShow
+        }/* ,
+        position:this.echartsData.tableTooltipNoShow */
      },
      legend: {
        data: ['剩余未核查','总数'],
-        textStyle: { color: '#000' }
+        textStyle: { color: '#000',fontSize: 18}
      },
      xAxis: {
        type: 'value',
        boundaryGap: [0, 0.01],
        axisLabel: {
+          textStyle:{
+            fontSize :15,
+            color:'#000000'
+          },
          color: "#000", //刻度线标签颜色
        },
        //设置坐标轴字体颜色和宽度
@ -449,10 +466,14 @@ export class notVerifiedComponent implements OnInit {
          lineStyle: {color: "#000"},
        },
        axisLabel: {
+          textStyle:{
+            fontSize :15,
+            color:'#000000'
+          },
          color: "#000", //刻度线标签颜色
          formatter: '{value}'
        },
-        data:  ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+        data:  ['浦东中队','黄浦中队','徐汇中队','长宁中队','静安中队','普陀中队','虹口中队','杨浦中队','闵行中队','宝山中队','嘉定中队','崇明中队','金山中队'],
      },
      series: [
        {
@ -554,7 +575,7 @@ export class detailedInformationComponent implements OnInit {
            lineStyle: {color: "#000",}
          },
          type: 'category',
-          data: ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+          data: ['浦东中队','黄浦中队','徐汇中队','长宁中队','静安中队','普陀中队','虹口中队','杨浦中队','闵行中队','宝山中队','嘉定中队','崇明中队','金山中队'],
          axisPointer: {type: 'shadow'}
        }],
        yAxis: [
@ -579,6 +600,7 @@ export class detailedInformationComponent implements OnInit {
            name: '已核查无需修改',
            type: 'bar',
            stack: '总数',
+            barWidth :'38',
            data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45],
          },
          {
@ -621,28 +643,38 @@ export class detailedInformationComponent implements OnInit {
      this.example.setOption(option);
    } else { //未核查
      var options = {
+        grid: {
+          left:90
+        },
        title: {
          text: this.echartsData.scheduledUpdatesName,
          left: 'center',
          textStyle:{
            color:'#000',
-            fontSize: 18,
+            fontSize: 30,
          },
        },
        tooltip: {
          trigger: 'axis',
+          textStyle:{
+            fontSize: 18
+          },
          axisPointer: {
              type: 'shadow'
          }
        },
        legend: {
          data: ['剩余未核查','总数'],
-          textStyle: { color: '#000' }
+          textStyle: { color: '#000',fontSize: 16 }
        },
        xAxis: {
          type: 'value',
          boundaryGap: [0, 0.01],
          axisLabel: {
+            textStyle:{
+              fontSize :18,
+              color:'#000000'
+            },
            color: "#000", //刻度线标签颜色
          },
          //设置坐标轴字体颜色和宽度
@ -657,6 +689,10 @@ export class detailedInformationComponent implements OnInit {
            lineStyle: {color: "#000"},
          },
          axisLabel: {
+            textStyle:{
+              fontSize :18,
+              color:'#000000'
+            },
            color: "#000", //刻度线标签颜色
            formatter: '{value}'
          },
--- a/src/app/statistic-analysis/state/page-one/page-one.component.ts
+++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-01 15:24:39
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-08 15:37:55
+ * @LastEditTime: 2020-09-11 15:35:09
 */
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
@ -76,7 +76,7 @@ export class PageOneComponent implements OnInit {
                show:true,
                // position: 'inner',
                fontSize:18,
-                formatter:'{b} {c}\n({d}%)',
+                formatter:'{b} {c}份\n({d}%)',
                },
                rich: {
                  d: {
--- 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
@ -420,7 +420,7 @@ export class PageTwoNameComponent implements OnInit {
          {
            name: '访问来源',
            type: 'pie',
-            radius: '80%',
+            radius: '75%',
            center: ['50%', '60%'],
            data: [
                {value: 1585, name: '预案新增'},
--- 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
@ -222,7 +222,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
      },
      tooltip: {
@ -313,7 +313,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
        bottom: 20,
      },
@ -405,7 +405,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
      },
      // 标题
@ -496,7 +496,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
      },
      // 标题
@ -588,7 +588,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
        bottom: 20,
      },
@ -681,7 +681,7 @@ export class echartsComponent implements OnInit {
    var option = {
      grid: {
        top: 50,
-        left:40,
+        left:50,
        right: 20,
        bottom: 20,
      },