diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index 460b2d5..6991fe5 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/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 -->
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss
index 958df3b..0c950d1 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.scss
+++ b/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;
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
index 5f58468..a0244fa 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
+++ b/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;
diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts
index bd53afe..f8fa6fa 100644
--- a/src/app/statistic-analysis/echarts-data.service.ts
+++ b/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= ' '+datas.name+' '
+
+ })
+ this.res= ''+datas.name+' '
this.res+='
|