From 0e722c9f6127ea7a41ca08fd36547e421b79edeb Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 25 Apr 2018 10:26:37 +0800
Subject: [PATCH] 饼图 结论

---
 src/app/routes/report/report.component.html |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index d485e30..31a282c 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -50,9 +50,28 @@
 			<div id="pieChar" style="height: 485.35px; width: 1000px"></div>
 		</div>
 
-		<div class="bg"  *ngIf="!spinning">
-			<div class="t_bg_b">
+		<div id="conclusion" class="bg"  *ngIf="!spinning && isShow" >
+ 			<div class="t_bg_b">
 				<h1>{{title}}������������������������</h1>
+				<div class="table_bg">
+					<div class="table_t">
+						<p class="t04">���������������������</p>
+						<p class="t03">������������</p>
+						<p class="t02">������������������������</p>
+						<p class="t01">���������</p>			
+						<div class="clear_fix"></div>	
+					</div>
+					<div class="table_text"  *ngFor="let item of resultArr;let i = index">
+						<img src="./assets/img/No{{i+1}}.png"  style="float: left;">
+						<div class="table_tab_bg">
+							<p class="tab1">{{item.sensorName}}</p>
+							<p class="tab2">{{item.monitorPointName}}({{item.result}})</p>
+							<p class="tab3">{{item.effect}}</p>
+							<p class="tab4">{{item.measures}}</p>
+							<div class="clear_fix"></div>
+						</div>	
+					</div>
+				</div>
 			</div>
 		</div>
 

--
Gitblit v1.8.0