From 2b76c020b627ed5cba7e1e0b33b49410e45dc8a6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 14 Mar 2018 08:58:46 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 8890aed..db89772 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,3 +1,26 @@
-<!-- <input type='button' value='������' class='notprint' onclick='javascript:window.print();' /> -->
+<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>
-<div id ="mydiv" style="height: 300px; width: 100%"></div>
+ <div id="content" style="display: none;">
+ <div *ngFor="let i of sensorArr">
+ <div id ="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
+ </div>
+ </div>
+
+ <div id="foot" style="height: 486px; width: 1000px" *ngIf="! spinning">
+ <h1>
+ ������������������
+ </h1>
+ </div>
+ </div>
+ </body>
+</html>
--
Gitblit v1.8.0