From cbd79e993a68b002397442d3cdea025b45ce139c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 11 May 2018 13:02:01 +0800
Subject: [PATCH] 去掉登录账户密码占位值
---
src/app/routes/report/report.component.html | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 624bb1b..31a282c 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -24,11 +24,6 @@
<div class="clear_fix"></div>
</div>
</div>
-
-
-
-
-
<div class="content">
<div *ngFor="let item of items;let i = index">
<div class="{{i % 2 == 0 ? 'left' : 'right'}}">
@@ -52,12 +47,31 @@
<div *ngFor="let i of sensorArr">
<div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>
</div>
- <!-- <div id="pieChar" style="height: 485.35px; width: 1000px"></div> -->
+ <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