From aee3b7ea53df69cedae9e8210987000caf059c9f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 14 Mar 2018 13:25:05 +0800
Subject: [PATCH] query.html修复
---
src/app/routes/dashboard/workplace/workplace.component.html | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 261 insertions(+), 36 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index ef1a73a..b9901ed 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -9,7 +9,7 @@
<div class="page-header">
<div class="avatar"><nz-avatar nzSize="large" nzSrc="https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png"></nz-avatar></div>
<div class="desc">
- <div class="desc-title">���������������������</div>
+ <div class="desc-title">���������admin���</div>
<p>��������������� | ������������������������������������������������������������</p>
</div>
</div>
@@ -17,18 +17,18 @@
<ng-template #extra>
<div class="page-extra">
<div>
- <p>������������</p>
+ <p>������</p>
<p>8<span> / 24</span></p>
</div>
<div>
<p>���������</p>
<p>20</p>
</div>
+ <!--
<div>
<p>���������</p>
- <p>560</p>
+ <p>1532</p>
</div>
- <!--
<div>
<p>������������</p>
<p>2,223</p>
@@ -37,31 +37,264 @@
</div>
</ng-template>
</pro-header>
+
+<div nz-row [nzGutter]="24" class="pt-lg" style="margin-top: -24px;">
+ <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
+ <chart-card [title]="'���������������'" total="{{totalDeviceCount | number: '1.0'}}" contentHeight="46px" [action]="action1" [footer]="footer1">
+ <ng-template #action1>
+ <nz-tooltip [nzTitle]="'���������������������������������������������������������'">
+ <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>
+ </nz-tooltip>
+ </ng-template>
+ <!--
+ <trend flag="up" style="display:block; margin-top:2px;">���������<span class="pl-sm">12%</span></trend>
+ <trend flag="down">���������<span class="pl-sm">11%</span></trend>
+ -->
+ <mini-bar height="46" [data]="totalDeviceCountList"></mini-bar>
+ <ng-template #footer1>
+ <p class="text-truncate">������������������:<span class="ml-sm">{{avgDeviceCount}}</span></p>
+ </ng-template>
+ </chart-card>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
+ <chart-card [title]="'������������������'" total="78%" contentHeight="46px" [action]="action2" [footer]="footer2">
+ <ng-template #action2>
+ <nz-tooltip [nzTitle]="'������������������������������������������������������'">
+ <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>
+ </nz-tooltip>
+ </ng-template>
+ <mini-progress height="46" percent="78" strokeWidth="8" target="80" color="#13C2C2"></mini-progress>
+ <ng-template #footer2>
+ <div class="d-flex justify-content-between">
+ <trend flag="up">���������<span class="pl-sm">8%</span></trend>
+ <trend flag="down">���������<span class="pl-sm">2%</span></trend>
+ </div>
+ </ng-template>
+ </chart-card>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
+ <chart-card [title]="'������������'" total="2,847" contentHeight="46px" [action]="action3" [footer]="footer3">
+ <ng-template #action3>
+ <nz-tooltip [nzTitle]="'���������������������������������������������'">
+ <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>
+ </nz-tooltip>
+ </ng-template>
+ <mini-area
+ color="#975FE4"
+ height="46"
+ [data]="data.visitData"></mini-area>
+ <ng-template #footer3>
+ <p class="text-truncate">������������������:<span class="ml-sm">1,234</span></p>
+ </ng-template>
+ </chart-card>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
+ <chart-card [title]="'������������������'" total="1,260" contentHeight="46px" [action]="action4" [footer]="footer4">
+ <ng-template #action4>
+ <nz-tooltip [nzTitle]="'������������������������������������������������'">
+ <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>
+ </nz-tooltip>
+ </ng-template>
+ <mini-bar
+ height="46"
+ color="gray"
+ [data]="data.visitData"></mini-bar>
+ <ng-template #footer4>
+ <p class="text-truncate">������������������:<span class="ml-sm">60</span></p>
+ </ng-template>
+ </chart-card>
+ </div>
+</div>
+<nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card">
+ <ng-template #body>
+ <nz-tabset>
+ <nz-tab>
+ <ng-template #nzTabHeading>������������</ng-template>
+ <div nz-row>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
+ <div class="bar">
+ <bar height="295" [title]="'������������������������'" [data]="data.alarmData" color="purple"></bar>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
+ <div class="rank-list">
+ <h4 class="rank-title">������������������</h4>
+ <ul>
+ <li *ngFor="let i of rankingListData; let idx = index">
+ <div>
+ <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
+ {{i.title}}
+ </div>
+ <span>{{i.total | number: '1.0'}}</span>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </nz-tab>
+
+ <nz-tab>
+ <ng-template #nzTabHeading>������������</ng-template>
+ <div nz-row>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
+ <div class="bar">
+ <bar height="295" [title]="'������������������������'" [data]="data.alarmData_1" color="yellow"></bar>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
+ <div class="rank-list">
+ <h4 class="rank-title">������������������</h4>
+ <ul>
+ <li *ngFor="let i of rankingListData; let idx = index">
+ <div>
+ <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
+ {{i.title}}
+ </div>
+ <span>{{i.total | number: '1.0'}}</span>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </nz-tab>
+
+ <nz-tab>
+ <ng-template #nzTabHeading>������������</ng-template>
+ <div nz-row>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
+ <div class="bar">
+ <bar height="295" [title]="'������������������������'" [data]="data.alarmData_2" color="orange"></bar>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
+ <div class="rank-list">
+ <h4 class="rank-title">������������������</h4>
+ <ul>
+ <li *ngFor="let i of rankingListData; let idx = index">
+ <div>
+ <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
+ {{i.title}}
+ </div>
+ <span>{{i.total | number: '1.0'}}</span>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </nz-tab>
+
+ <nz-tab>
+ <ng-template #nzTabHeading>������������</ng-template>
+ <div nz-row>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
+ <div class="bar">
+ <bar height="295" [title]="'������������������������'" [data]="data.alarmData_3" color="red"></bar>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
+ <div class="rank-list">
+ <h4 class="rank-title">������������������</h4>
+ <ul>
+ <li *ngFor="let i of rankingListData; let idx = index">
+ <div>
+ <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
+ {{i.title}}
+ </div>
+ <span>{{i.total | number: '1.0'}}</span>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </nz-tab>
+ </nz-tabset>
+ </ng-template>
+</nz-card>
+<div nz-row [nzGutter]="24">
+ <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="12">
+ <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="������������������">
+ <ng-template #extra>
+ <nz-dropdown>
+ <nz-icon class="icon-group" nz-dropdown nzType="ellipsis"></nz-icon>
+ <ul nz-menu>
+ <li nz-menu-item>���������</li>
+ <li nz-menu-item>���������</li>
+ </ul>
+ </nz-dropdown>
+ </ng-template>
+ <ng-template #body>
+ <div nz-row [nzGutter]="64">
+ <div nz-col nzXs="24" nzSm="12" class="mb-md">
+ <number-info total="12,321" subTotal="17.1" status="up" [subTitle]="subTitle">
+ <ng-template #subTitle>
+ ���������������
+ <nz-tooltip [nzTitle]="'������������'">
+ <nz-icon nz-tooltip nzType="info-circle-o" class="ml-sm"></nz-icon>
+ </nz-tooltip>
+ </ng-template>
+ </number-info>
+ <mini-area [line]="true" height="45" [data]="data.visitData2"></mini-area>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" class="mb-md">
+ <number-info subTitle="������������������" total="2.7" subTotal="26.2" status="down"></number-info>
+ <mini-area [line]="true" height="45" [data]="data.visitData2"></mini-area>
+ </div>
+ </div>
+ <nz-table #keyTable [nzDataSource]="data.searchData" [nzPageSize]="5" nzSize="small">
+ <thead nz-thead>
+ <tr>
+ <th nz-th><span>������</span></th>
+ <th nz-th><span>���������������</span></th>
+ <th nz-th class="text-right">
+ <span>���������</span>
+ <nz-table-sort (nzValueChange)="sort('count',$event)"></nz-table-sort>
+ </th>
+ <th nz-th class="text-right">
+ <span>���������</span>
+ <nz-table-sort (nzValueChange)="sort('range',$event)"></nz-table-sort>
+ </th>
+ </tr>
+ </thead>
+ <tbody nz-tbody>
+ <tr nz-tbody-tr *ngFor="let i of keyTable.data">
+ <td nz-td>{{i.index}}</td>
+ <td nz-td><a (click)="msg.success(i.keyword)">{{i.keyword}}</a></td>
+ <td nz-td class="text-right">{{i.count}}</td>
+ <td nz-td class="text-right">
+ <trend [flag]="i.status === 1 ? 'down' : 'up'">
+ <span>{{i.range}}%</span>
+ </trend>
+ </td>
+ </tr>
+ </tbody>
+ </nz-table>
+ </ng-template>
+ </nz-card>
+ </div>
+ <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="12">
+ <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
+ <ng-template #extra>
+ <div class="sales-card-extra">
+ <div class="sales-type-radio">
+ <nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
+ <label nz-radio-button [nzValue]="'0'"><span>������</span></label>
+ <label nz-radio-button [nzValue]="'1'"><span>������</span></label>
+ <label nz-radio-button [nzValue]="'2'"><span>������</span></label>
+ <label nz-radio-button [nzValue]="'3'"><span>������</span></label>
+ </nz-radio-group>
+ </div>
+ </div>
+ </ng-template>
+ <ng-template #body>
+ <h4 class="margin:8px 0 32px 0;">������������</h4>
+ <pie [hasLegend]="true" subTitle="������������" [height]="248" [lineWidth]="4" [total]="salesTotal" [data]="salesPieData" [valueFormat]="handlePieValueFormat"></pie>
+ </ng-template>
+ </nz-card>
+ </div>
+</div>
+
<div nz-row [nzGutter]="24">
<div nz-col nzXs="24" nzSm="24" nzMd="16">
- <nz-card nzTitle="������������������" [nzBordered]="false" [nzLoading]="loading" nzNoPadding class="mb-lg project-list">
- <ng-template #extra>
- <a (click)="msg.success('to')">������������</a>
- </ng-template>
- <div *ngFor="let item of notice" nz-card-grid class="project-grid">
- <nz-card nzNoPadding [nzBordered]="false" class="mb0">
- <nz-card-meta [nzTitle]="noticeTitle" [nzDescription]="item.description">
- <ng-template #noticeTitle>
- <div class="card-title">
- <nz-avatar [nzSrc]="item.logo" [nzSize]="'small'"></nz-avatar>
- <a (click)="msg.info('to' + item.href)">{{item.title}}</a>
- </div>
- </ng-template>
- </nz-card-meta>
- <div class="project-item">
- <a (click)="msg.info('show user: ' + item.member)">{{item.member}}</a>
- <span *ngIf="item.updatedAt" class="datetime" title="{{item.updatedAt}}">
- {{item.updatedAt | _date: 'fn' }}
- </span>
- </div>
- </nz-card>
- </div>
- </nz-card>
<nz-card nzTitle="������" [nzBordered]="false" [nzLoading]="loading" nzNoPadding class="mb-lg active-card">
<nz-list nzSize="large">
<nz-list-item *ngFor="let item of activities" class="activities">
@@ -83,18 +316,10 @@
</nz-card>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="8">
- <nz-card nzTitle="������������ / ������������" [nzBordered]="false" nzNoPadding class="mb-lg">
- <div class="links">
- <a *ngFor="let item of links" (click)="msg.success(item.title)">{{item.title}}</a>
- <button nz-button (click)="links.push({title: 'new titel', href: 'href'})" [nzType]="'dashed'" [nzSize]="'small'">
- <i class="anticon anticon-plus"></i><span>������</span>
- </button>
- </div>
- </nz-card>
<nz-card nzTitle="XX ������" [nzBordered]="false" [nzLoading]="loading" class="mb-lg">
<ng-template #body><radar [data]="radarData" [height]="343" [hasLegend]="true"></radar></ng-template>
</nz-card>
- <nz-card nzTitle="������" [nzBordered]="false" [nzBodyStyle]="{'padding-top.px': 12, 'padding-bottom.px': 12 }" class="mb-lg">
+ <nz-card nzTitle="������" [nzBordered]="false" [nzBodyStyle]="{'padding-top.px': 12, 'padding-bottom.px': 12 }" class="mb-lg">
<div class="members">
<div nz-row [nzGutter]="48">
<div nz-col [nzSpan]="12" *ngFor="let i of members">
--
Gitblit v1.8.0