From bd1966ac64e93a610a4635c3eefd5115ab825c5b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 16 Mar 2018 13:43:17 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index db89772..5644aae 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,26 +1,61 @@
<html>
- <body>
- <nz-spin [nzTip]="'������������������...'"[nzSize]="'large'" [nzSpinning]="spinning">
- </nz-spin>
-
- <div >
- <div id="head" style="height: 486px; width: 1000px" *ngIf="! spinning">
- <h1>
- ������������������������
- </h1>
- </div>
+<body>
+ <nz-spin [nzTip]="'������������������...'" [nzSize]="'large'"[nzSpinning]="spinning"> </nz-spin>
- <div id="content" style="display: none;">
- <div *ngFor="let i of sensorArr">
- <div id ="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
+ <div>
+ <div class="bg" *ngIf="! spinning">
+ <div class="t_bg">
+ <img src="./assets/img/logo.png">
+
+ <h1>2018���01���������������������������</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>
+ </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="left">
+ <h2>{{item.monitorPointName}}</h2>
+ <p class="text1">���������������{{item.monitorPointAddress}}</p>
+ <p class="text1">���������������������{{item.deviceCount}}���</p>
+ <div class="clear_fix"></div>
+ </div>
+ </div> -->
+ <div class="clear_fix"></div>
</div>
</div>
+ </div>
- <div id="foot" style="height: 486px; width: 1000px" *ngIf="! spinning">
- <h1>
- ������������������
- </h1>
+
+ <div id="content" style="display: none;">
+ <div *ngFor="let i of sensorArr">
+ <div id="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
</div>
</div>
- </body>
+
+ <!-- <div id="foot" style="height: 486px; width: 1000px">
+ <h1>������������������</h1>
+ </div> -->
+
+ <div class="bg" *ngIf="! spinning">
+ <div class="t_bg_b">
+ <h1>2018���01������������������������������</h1>
+ </div>
+ </div>
+
+ </div>
+</body>
</html>
--
Gitblit v1.8.0