From 7f762717c4580a17377a33cf04351fa3abaea61d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 15:25:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 8e61a48..5e0387f 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -23,7 +23,12 @@
<div class="content">
<div *ngFor="let item of items;let i = index">
<div class="{{i % 2 == 0 ? 'left' : 'right'}}">
- <h2>{{item.monitorPointName}}</h2>
+ <div class="text_t">
+ <div class="text_t_left"></div>
+ <div class="text_t_bg">{{item.monitorPointName}}</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>
<div class="clear_fix"></div>
@@ -37,7 +42,7 @@
<div id="content" style="display: none;">
<div *ngFor="let i of sensorArr">
- <div id="mydiv{{i}}" style="height: 485.3px; width: 1000px"></div>
+ <div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>
</div>
</div>
--
Gitblit v1.8.0