From 2b76c020b627ed5cba7e1e0b33b49410e45dc8a6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 14 Mar 2018 08:58:46 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/dashboard/workplace/workplace.component.html | 213 ++++++++++++++++++-----------------------------------
1 files changed, 72 insertions(+), 141 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index e74510f..be53386 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -40,12 +40,7 @@
<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}}"
- contentHeight="46px"
- [action]="action1"
- [footer]="footer1">
+ <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>
@@ -62,22 +57,13 @@
</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">
+ <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>
+ <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>
@@ -87,11 +73,7 @@
</chart-card>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
- <chart-card [title]="'������������'"
- total="8,848"
- contentHeight="46px"
- [action]="action3"
- [footer]="footer3">
+ <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>
@@ -107,11 +89,7 @@
</chart-card>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
- <chart-card [title]="'���������������'"
- total="6,560"
- contentHeight="46px"
- [action]="action4"
- [footer]="footer4">
+ <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>
@@ -119,10 +97,10 @@
</ng-template>
<mini-bar
height="46"
- color="orange"
+ color="gray"
[data]="data.visitData"></mini-bar>
<ng-template #footer4>
- <p class="text-truncate">������������������:<span class="ml-sm">220</span></p>
+ <p class="text-truncate">������������������:<span class="ml-sm">60</span></p>
</ng-template>
</chart-card>
</div>
@@ -131,71 +109,104 @@
<ng-template #body>
<nz-tabset>
<nz-tab>
- <ng-template #nzTabHeading>���������</ng-template>
+ <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.salesData"></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>
+ <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: '3.0'}}</span>
+ <span>{{i.total | number: '1.0'}}</span>
</li>
</ul>
</div>
</div>
</div>
</nz-tab>
+
<nz-tab>
- <ng-template #nzTabHeading>���������</ng-template>
+ <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.salesData"></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>
+ <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: '3.0'}}</span>
+ <span>{{i.total | number: '1.0'}}</span>
</li>
</ul>
</div>
</div>
</div>
</nz-tab>
- <ng-template #nzTabBarExtraContent>
- <div class="sales-extra-wrap">
- <div class="sales-extra">
- <a (click)="setDate('today')">������</a>
- <a (click)="setDate('week')">������</a>
- <a (click)="setDate('month')">������</a>
- <a (click)="setDate('year')">������</a>
+
+ <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>
- <nz-datepicker style="width:120px" class="mr-md" [(ngModel)]="q.start" [nzFormat]="'YYYY-MM-DD'" [nzPlaceHolder]="'������������'"></nz-datepicker>
- <nz-datepicker style="width:120px" [(ngModel)]="q.end" [nzFormat]="'YYYY-MM-DD'" [nzPlaceHolder]="'������������'"></nz-datepicker>
+ <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>
- </ng-template>
+ </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>
@@ -261,101 +272,29 @@
</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;">
+ <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">
- <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>
<div class="sales-type-radio">
<nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
- <label nz-radio-button [nzValue]="'all'"><span>������������</span></label>
- <label nz-radio-button [nzValue]="'online'"><span>������</span></label>
- <label nz-radio-button [nzValue]="'offline'"><span>������</span></label>
+ <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>
+ <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>
-<nz-card [nzLoading]="loading" [nzBordered]="false" [nzBodyStyle]="{'padding': '0 0 32px'}" class="offline-card mt-lg">
- <ng-template #body>
- <nz-tabset [(nzSelectedIndex)]="_activeTab" (nzSelectChange)="_tabChange($event)">
- <nz-tab *ngFor="let tab of data.offlineData; let i = index;">
- <ng-template #nzTabHeading>
- <div nz-row [nzGutter]="8" style="width: 138px; margin: 8px 0">
- <div nz-col [nzSpan]="12">
- <number-info
- [title]="tab.name"
- subTitle="���������"
- gap="2"
- [total]="(tab.cvr * 100) + '%'"
- [theme]="i !== _activeTab && 'light'"></number-info>
- </div>
- <div nz-col [nzSpan]="12" style="padding-top: 36px">
- <pie
- [animate]="false"
- [color]="i !== _activeTab && '#BDE4FF'"
- [inner]="0.55"
- [tooltip]="false"
- [padding]="[0, 0, 0, 0]"
- [percent]="tab.cvr * 100"
- [height]="64">
- </pie>
- </div>
- </div>
- </ng-template>
- <div class="px-lg">
- <timeline [data]="tab.chart"
- [titleMap]="{ y1: '���������', y2: '������������' }"></timeline>
- </div>
- </nz-tab>
- </nz-tabset>
- </ng-template>
-</nz-card>
<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">
@@ -377,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