From 40951bf70651c38d09a3b1f5eaddde8faa9e8c06 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 16:28:52 +0800
Subject: [PATCH] 查看数据bug修复，修改密码功能开发
---
src/app/routes/report/report.component.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 94fb4d1..5e0387f 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>
@@ -27,8 +22,13 @@
<div class="content">
<div *ngFor="let item of items;let i = index">
- <div class="left">
- <h2>{{item.monitorPointName}}</h2>
+ <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_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>
@@ -42,7 +42,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.35px; width: 1000px"></div>
</div>
</div>
@@ -52,7 +52,7 @@
<div class="bg" *ngIf="! spinning">
<div class="t_bg_b">
- <h1>2018���01������������������������������</h1>
+ <h1>{{title}}������������������������</h1>
</div>
</div>
--
Gitblit v1.8.0