From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 31a282c..516b364 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -17,7 +17,7 @@
<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>
@@ -29,12 +29,12 @@
<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 *ngIf="item.monitorPointId" class="text1">���������������{{item.monitorPointAddress}}</p>
- <p class="text1">������������������{{item.deviceCount}}���</p>
+ <p class="text1">������������������{{item.deviceCount?item.deviceCount:0}}���</p>
<div class="clear_fix"></div>
</div>
</div>
--
Gitblit v1.8.0