From fdde9a5cb356933bac26b64b67b53167ce2f41bd Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 17 May 2018 10:03:29 +0800
Subject: [PATCH] 行业 优化
---
src/app/routes/report/report.component.html | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 42bf6e2..516b364 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -12,30 +12,29 @@
<div class="t_bg">
<img src="./assets/img/logo.png">
- <h1>{{title}}������������������������</h1>
+ <h1>{{title}}������������������</h1>
<div class="container">
<div class="title">
<div class="title_left"></div>
<div class="text">
- <span *ngFor="let item of items;let i = index"><span *ngIf="i > 0">���</span>{{item.monitorPointName}}</span>
+ <span *ngFor="let item of items;let i = index"><span *ngIf="i > 0">���</span>{{item.monitorPointName}}{{item.professionName}}</span>
<span>������������������</span>
</div>
<div class="title_right"></div>
<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'}}">
<div class="text_t">
<div class="text_t_left"></div>
- <div class="text_t_bg">{{item.monitorPointName}}</div>
+ <div class="text_t_bg">{{item.monitorPointName}}{{item.professionName}}</div>
<div class="text_t_right"></div>
<div class="clear_fix"></div>
</div>
- <p class="text1">���������������{{item.monitorPointAddress}}</p>
- <p class="text1">���������������������{{item.deviceCount}}���</p>
+ <p *ngIf="item.monitorPointId" class="text1">���������������{{item.monitorPointAddress}}</p>
+ <p class="text1">������������������{{item.deviceCount?item.deviceCount:0}}���</p>
<div class="clear_fix"></div>
</div>
</div>
@@ -48,11 +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>
- <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