From cb370be00fe6b23a8e13cbbd75c66bab9fed50c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 14:58:47 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 5644aae..8e61a48 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -7,18 +7,13 @@
<div class="t_bg">
<img src="./assets/img/logo.png">
- <h1>2018���01���������������������������</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 >
- ������������������
- </span>
+ <span *ngFor="let item of items;let i = index"><span *ngIf="i > 0">���</span>{{item.monitorPointName}}</span>
+ <span>������������������</span>
</div>
<div class="title_right"></div>
<div class="clear_fix"></div>
@@ -26,14 +21,14 @@
</div>
<div class="content">
- <!-- <div *ngFor="let item of items;let i = index">
- <div class="left">
+ <div *ngFor="let item of items;let i = index">
+ <div class="{{i % 2 == 0 ? 'left' : 'right'}}">
<h2>{{item.monitorPointName}}</h2>
<p class="text1">���������������{{item.monitorPointAddress}}</p>
<p class="text1">���������������������{{item.deviceCount}}���</p>
<div class="clear_fix"></div>
</div>
- </div> -->
+ </div>
<div class="clear_fix"></div>
</div>
</div>
@@ -42,7 +37,7 @@
<div id="content" style="display: none;">
<div *ngFor="let i of sensorArr">
- <div id="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
+ <div id="mydiv{{i}}" style="height: 485.3px; width: 1000px"></div>
</div>
</div>
@@ -52,7 +47,7 @@
<div class="bg" *ngIf="! spinning">
<div class="t_bg_b">
- <h1>2018���01������������������������������</h1>
+ <h1>{{title}}������������������������</h1>
</div>
</div>
--
Gitblit v1.8.0