From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 8890aed..224d7e4 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,3 +1,61 @@
-<!-- <input type='button' value='������' class='notprint' onclick='javascript:window.print();' /> -->
+<html>
+<body>
+ <nz-spin [nzTip]="'������������������...'" [nzSize]="'large'"[nzSpinning]="spinning"> </nz-spin>
-<div id ="mydiv" style="height: 300px; width: 100%"></div>
+ <div>
+ <div class="bg" *ngIf="! spinning">
+ <div class="t_bg">
+ <img src="./assets/img/logo.png">
+
+ <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>
+ </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="{{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 class="clear_fix"></div>
+ </div>
+ </div>
+ </div>
+
+
+ <div id="content" style="display: none;">
+ <div *ngFor="let i of sensorArr">
+ <div id="mydiv{{i}}" style="height: 485.3px; width: 1000px"></div>
+ </div>
+ </div>
+
+ <!-- <div id="foot" style="height: 486px; width: 1000px">
+ <h1>������������������</h1>
+ </div> -->
+
+ <div class="bg" *ngIf="! spinning">
+ <div class="t_bg_b">
+ <h1>{{title}}������������������������</h1>
+ </div>
+ </div>
+
+ </div>
+</body>
+</html>
--
Gitblit v1.8.0