From 051a77599ca8b7972df8728ff46822d308627cbc Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:32:32 +0800
Subject: [PATCH] 报表 优化

---
 src/app/routes/report/report.component.html |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 8e61a48..42bf6e2 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,9 +1,14 @@
+<!DOCTYPE HTML>
 <html>
+<head>
+	<meta charset="utf-8">
+	<title>������������</title>
+</head>
 <body>
 	<nz-spin [nzTip]="'������������������...'" [nzSize]="'large'"[nzSpinning]="spinning"> </nz-spin>
 
 	<div>
-		<div class="bg" *ngIf="! spinning">
+		<div class="bg" *ngIf="!spinning">
 			<div class="t_bg">
 				<img src="./assets/img/logo.png">
 				
@@ -23,7 +28,12 @@
 				<div class="content">
 					<div *ngFor="let item of items;let i = index">
 						<div class="{{i % 2 == 0 ? 'left' : 'right'}}">
-							<h2>{{item.monitorPointName}}</h2>
+							<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>
@@ -34,18 +44,13 @@
 			</div>
 		</div>
 
-
-		<div id="content" style="display: none;">
+		<div [ngStyle]="{'display':spinning ? 'none' : 'block' }">
 			<div *ngFor="let i of sensorArr">
-				<div id="mydiv{{i}}" style="height: 485.3px; width: 1000px"></div>
+				<div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>
 			</div>
 		</div>
 
-		<!-- <div id="foot" style="height: 486px; width: 1000px">
-			<h1>������������������</h1>
-		</div> -->
-
-		<div class="bg"  *ngIf="! spinning">
+		<div class="bg"  *ngIf="!spinning">
 			<div class="t_bg_b">
 				<h1>{{title}}������������������������</h1>
 			</div>

--
Gitblit v1.8.0