From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/report/report.component.html | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/src/app/routes/report/report.component.html b/src/app/routes/report/report.component.html
index 224d7e4..516b364 100644
--- a/src/app/routes/report/report.component.html
+++ b/src/app/routes/report/report.component.html
@@ -1,36 +1,40 @@
+<!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>
<div class="text">
- <span *ngFor="let item of items;let i = index">
- <span *ngIf="i > 0">���</span>
- {{item.monitorPointName}}
- </span>
- <span >
- ������������������
- </span>
+ <span *ngFor="let item of items;let i = index"><span *ngIf="i > 0">���</span>{{item.monitorPointName}}{{item.professionName}}</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="text_t">
+ <div class="text_t_left"></div>
+ <div class="text_t_bg">{{item.monitorPointName}}{{item.professionName}}</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?item.deviceCount:0}}���</p>
<div class="clear_fix"></div>
</div>
</div>
@@ -39,20 +43,35 @@
</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="t_bg_b">
+ <div id="conclusion" class="bg" *ngIf="!spinning && isShow" >
+ <div class="t_bg_b">
<h1>{{title}}������������������������</h1>
+ <div class="table_bg">
+ <div class="table_t">
+ <p class="t04">���������������������</p>
+ <p class="t03">������������</p>
+ <p class="t02">������������������������</p>
+ <p class="t01">���������</p>
+ <div class="clear_fix"></div>
+ </div>
+ <div class="table_text" *ngFor="let item of resultArr;let i = index">
+ <img src="./assets/img/No{{i+1}}.png" style="float: left;">
+ <div class="table_tab_bg">
+ <p class="tab1">{{item.sensorName}}</p>
+ <p class="tab2">{{item.monitorPointName}}({{item.result}})</p>
+ <p class="tab3">{{item.effect}}</p>
+ <p class="tab4">{{item.measures}}</p>
+ <div class="clear_fix"></div>
+ </div>
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.8.0