From 780f76a3e8dd68abe6b007006f85a76991ea2c54 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Apr 2018 13:40:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.html | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 3873886..624bb1b 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,5 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>������������</title>
+</head>
+<body>
+ <nz-spin [nzTip]="'������������������...'" [nzSize]="'large'"[nzSpinning]="spinning"> </nz-spin>
-<div *ngFor="let i of sensorArr">
- <div id ="mydiv{{i}}" style="height: 487px; width: 1000px"></div>
-</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'}}">
+ <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 *ngIf="item.monitorPointId" 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 [ngStyle]="{'display':spinning ? 'none' : 'block' }">
+ <div *ngFor="let i of sensorArr">
+ <div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>
+ </div>
+ <!-- <div id="pieChar" style="height: 485.35px; width: 1000px"></div> -->
+ </div>
+
+ <div class="bg" *ngIf="!spinning">
+ <div class="t_bg_b">
+ <h1>{{title}}������������������������</h1>
+ </div>
+ </div>
+
+ </div>
+</body>
+</html>
--
Gitblit v1.8.0