From 69e41a0824b0a4737360a5e19929555279e7c292 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Sun, 08 Apr 2018 11:25:47 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/report/report.component.html | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 8e61a48..624bb1b 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,13 +1,18 @@
+<!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">
- <h1>{{title}}������������������������</h1>
+ <h1>{{title}}������������������</h1>
<div class="container">
<div class="title">
<div class="title_left"></div>
@@ -20,12 +25,21 @@
</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="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>
@@ -34,18 +48,14 @@
</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 id="pieChar" style="height: 485.35px; width: 1000px"></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