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

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-05 14:49:01
+ * @LastEditTime: 2021-03-06 16:56:07
 -->
 <div class="box">
     <div class="boxleft">
@@ -98,7 +98,7 @@
                 </table>
                   <div class="tbodycss" id="tbodydiv" >
                     <table cellspacing="0" cellpadding="0" id="table" >
-                      <tr *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,item)'>
+                      <tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,item)'>
                         <td style="width: 15%;">
                           <!-- <input type="radio" name="yuan"  value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
                           {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?

src/app/plan-audit/plan-record/plan-record.component.scss

@@ -33,18 +33,21 @@
         }
         .tablediv{
             width: 100%;
-            height: 70%;
+            height: 100%;
+            padding-bottom: 20px;
             .tbodycss{
                 overflow-y: auto;
-                height: 600px;
+                height:550px;
                 width: 100%;
+                .selectedTr{
+                    background-color: #b3d3ee;
+                }
             }
             table{
                 //margin: 20px 20px;
                 margin-left: 10px;
                 margin-right: 10px;
                 width: 97.5%;
-                
                 //border: 1px solid #2196F3;
                 thead{
                     height:48px;

src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@@ -45,10 +45,10 @@
         }
         .tablediv{
             width: 100%;
-            height: 70%;
+            height: 100%;
             .tbodycss{
                 overflow-y: auto;
-                height: 700px;
+                height: 650px;
                 width: 100%;
                 .selectedTr{
                     background-color: #b3d3ee;
@@ -58,6 +58,7 @@
                 margin-left:10px;
                 margin-right: 10px;
                 width: 97.5%;
+                //margin-bottom: 10px;
                 thead{
                     height:48px;
                     color: #FFFFFF;

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

@@ -409,35 +409,36 @@ export class EchartsDataService {
       BuildingTypeId:datas.id
     }
     //var res
-    this.http.get("/api/StatisticsAnalysis/BuildingTypes",{params:paramsdata}).subscribe((data:any)=>{
+    this.http.get("/api/StatisticsAnalysis",{params:paramsdata}).subscribe((data:any)=>{
       this.tishiData=data
       console.log(this.tishiData)
-      this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
+      
+    })
+    this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
       this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px;  color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
       this.res+='<thead style="font-size:18px;"><tr>';
-      this.res+='<td style="text-align:center;width:30%;">名称</td>';
+      this.res+='<td style="text-align:center;width:30%;>名称</td>';
       this.res+='<td style="text-align:center;width:30%;">数量</td>'
       this.res+='<td style="text-align:center;width:30%;">总占比</td>'
       this.res+='</tr></thead>'
       this.res+='<tbody>';
       var countall=0
-      for(var i=0;i<this.tishiData.organizationStatistics.organizations.length;i++){
+      for(var i=0;i<this.tishiData.companyStatistics.organizationStatistics.organizations.length;i++){
-        countall+=this.tishiData.organizationStatistics.organizations[i].count
+        countall+=this.tishiData.companyStatistics.organizationStatistics.organizations[i].count
         
       }
       //var res='<div class="tishi" style=" width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span >'+biaotou+'</span></div>'
-      for(var i=0;i<this.tishiData.organizationStatistics.organizations.length;i++){
+      for(var i=0;i<this.tishiData.companyStatistics.organizationStatistics.organizations.length;i++){
        this.res+='<tr>'
-       this.res+='<td style="text-align:center;">'+this.tishiData.organizationStatistics.organizations[i].organizationName+'</td>'
+       this.res+='<td style="text-align:center;width:30%;">'+this.tishiData.companyStatistics.organizationStatistics.organizations[i].organizationName+'</td>'
-       this.res+='<td style="text-align:center;">'+this.tishiData.organizationStatistics.organizations[i].count+'</td>'
+       this.res+='<td style="text-align:center;width:30%;">'+this.tishiData.companyStatistics.organizationStatistics.organizations[i].count+'</td>'
-       this.res+='<td style="text-align:center;">'+Math.round(this.tishiData.organizationStatistics.organizations[i].count/countall* 10000)/ 100.00 +'%</td></tr>'
+       this.res+='<td style="text-align:center;width:30%;">'+Math.round(this.tishiData.companyStatistics.organizationStatistics.organizations[i].count/countall* 10000)/ 100.00 +'%</td></tr>'
       }
       
       this.res+='</tbody>'
-      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+this.tishiData.totalCount+'</td><td style="text-align:center;">100%</td></tfoot>'
+      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+this.tishiData.companyStatistics.totalCount+'</td><td style="text-align:center;">100%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
-    })
     
  }
    zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]