Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

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

@@ -111,7 +111,7 @@ export class AddUnitOneComponent implements OnInit {
         bottom: 90,
         left: 'center',
         textStyle:{
-          fontSize:12,
+          fontSize:14,
           color:"#000000"
            },
         data: tid=="pieone"?this.lengthOrData:this.lengthBuildData
@@ -126,12 +126,12 @@ export class AddUnitOneComponent implements OnInit {
           left:30,
           label:{
             show:true,
-            fontSize:14,
+            fontSize:16,
             formatter:'{b}\n{c}家{d|({d}%)}',
             rich: {
               d: {
                 align: 'center',
-                fontSize:18
+                fontSize:16
               }
             },
           },

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

@@ -38,8 +38,8 @@
 .publicCss{
     width: 100%;
     @media screen and (max-device-width:1400px){
-        height: 500px;
+        height: 600px;
-        top: 55%;
+        top: 60%;
     }
     @media screen and (min-device-width:1400px){
         height: 550px;

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

@@ -372,7 +372,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
         title: {
           text: this.headname+`：总数（${this.tabledata[0].totalCount}）`,
           left: "center",
-          top: "0",
+          top: -4,
           //bottom: '80%',
           textStyle: {
             fontSize: 30
@@ -380,8 +380,8 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
         },
         grid: {
           containLabel:true,
-          top:this.padHw?60:90,
+          top:90,
-          bottom: 30
+         // top: 10
       },
         xAxis: {
             id:this.zhiorbuild=="zhi"?this.buildingTypeId:this.organizationId,

src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts

@@ -119,13 +119,13 @@ export class PageThereYearComponent implements OnInit {
     this.detailPlanEchart = echarts.init(document.getElementById('barEchart'), 'skinUpp');  
     this.option = {
       grid: {
-        top: 90,
+        top: 110,
         
       },
       // 标题
       title: {
         text: `${this.year}${this.buildingTypeName}`,
-        top: -4,
+        //top: -14,
         left: 'center',
         textStyle:{
           //文字颜色

src/app/statistic-analysis/state/page-there/page-there.component.ts

@@ -32,6 +32,10 @@ export class PageThereComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    if(sessionStorage.getItem('refresh') === 'true') {
+      sessionStorage.removeItem('refresh');
+      location.reload();
+     }
     if(window.matchMedia("(max-width: 1400px)").matches){
       this.padHw=true
       //this.padjt=
@@ -165,7 +169,7 @@ export class PageThereComponent implements OnInit {
     this.zhutu = ec.init(document.getElementById('zhidui'),'walden');
     this.option = {
       title: {
-        text: headName,
+        text: headName+`总数(${this.tabledata[0].totalCount})`,
         left: "center",
         top:0,
         //bottom: "540",

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

@@ -21,15 +21,16 @@
     overflow: auto;
     #pie{
         width: 100%;
+        height: 550px;
         @media screen and (max-device-width:1400px){
-            height: 450px;
+            top: 65%;
         }
         @media screen and (min-device-width:1400px){
-            height: 550px;
+            top: 55%;
         }
         position: absolute;
         left: 50%;
-        top: 55%;
+        
         transform: translate(-50%,-50%);
     }
   }

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

@@ -113,6 +113,7 @@ export class PageTwoNameComponent implements OnInit {
   addEchart
   tabledata
   organizationId=[]
+  
   //预案新增统计
   planAdd () {
     let _this = this
@@ -127,6 +128,7 @@ export class PageTwoNameComponent implements OnInit {
         }
       },
       grid: {
+        containLabel:true,
         top:this.padHw?100: 80,
         //bottom: 10
        },
@@ -134,15 +136,13 @@ export class PageTwoNameComponent implements OnInit {
           id:this.organizationId,
           type: 'category',
           data: this.zhiNameData,
-          axisLabel:{
+          axisLabel:this.padHw?this.axisLabel:{
             //this.axisLabel,
             textStyle:{
               fontSize :16,
               color:'#000000'
             },
             interval: 0,
-            
-            
           },
       },
       yAxis: {

src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-05 13:50:45
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-31 16:32:39
+ * @LastEditTime: 2021-04-07 10:51:10
  */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -28,11 +28,18 @@ export class PageZhongDuiDetailsComponent implements OnInit {
   lastid
   tabledata
   organizationId=[]
+  padHw
   ngOnInit(): void {
     if(sessionStorage.getItem('refresh') === 'true') {
       sessionStorage.removeItem('refresh');
       location.reload();
      }
+     if(window.matchMedia("(max-width: 1400px)").matches){
+      this.padHw=true
+      //this.padjt=
+    }else{
+      this.padHw=false
+    }
     let level:string;
       this.route.queryParams.subscribe(param=>{
         //this.headtext=param.headtext
@@ -73,12 +80,42 @@ export class PageZhongDuiDetailsComponent implements OnInit {
    
     //this.echartsData.statefulInspectionToggle = true
   }
+  axisLabel = {
+    interval: 0,
+    //rotate:-30,  
+    textStyle:{
+      fontSize :15,
+      color:'#000000'
+    },
+    formatter:function(value)  
+      {    
+        var ret = "";//拼接加\n返回的类目项  
+        var maxLength = 2;//每项显示文字个数  
+        var valLength = value.length;//X轴类目项的文字个数  
+        var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
+        if (rowN > 1)//如果类目项的文字大于3,  
+        {  
+            for (var i = 0; i < rowN; i++) {  
+                var temp = "";//每次截取的字符串  
+                var start = i * maxLength;//开始截取的位置  
+                var end = start + maxLength;//结束截取的位置  
+                //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
+                temp = value.substring(start, end) + "\n";  
+                ret += temp; //凭借最终的字符串  
+            }  
+            return ret;  
+        }  
+        else {  
+            return value;  
+        }  
+      }
+  }//echarts两个字换行
   detailPlanEchart
   detailEcharts(){
     this.detailPlanEchart = echarts.init(document.getElementById('detailBox'),'walden');  
     var option = {
       title: {
-        text: this.headName,
+        text: this.headName+`总数(${this.tabledata[0].totalCount})`,
         left: "center",
         top: "0",
         textStyle: {
@@ -86,6 +123,7 @@ export class PageZhongDuiDetailsComponent implements OnInit {
         }
       },
       grid: {
+        containLabel:true,
         top: 110,
         //bottom: 10
     },
@@ -93,7 +131,7 @@ export class PageZhongDuiDetailsComponent implements OnInit {
           id:this.organizationId,
           type: 'category',
           data: this.zhongNameData,
-          axisLabel:{
+          axisLabel:this.padHw?this.axisLabel: {
             //this.axisLabel,
             interval: 0,
             textStyle:{