shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[修改]统计分析维护更新统计返回逻辑修改

dev
chenjingyu 4 years ago
parent
76a031363e
commit
21fcb1c446
4 changed files with 31 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
  2. 7
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
  3. 8
      src/app/statistic-analysis/scheduled-updates/moreTable.html
  4. 32
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

5
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn
* @LastEditTime: 2020-11-14 10:05:27
* @LastEditTime: 2020-11-17 14:12:19
-->
<div class="box">
<div class="header">
@ -67,6 +67,9 @@
<button type="submit" mat-raised-button color="primary">查询</button>
</form>
</div>
<div class="queryField">
<button mat-raised-button (click)="goBack()">返回</button>
</div>
<!-- <div class="fixedCss">
<button mat-raised-button (click)='goBack()' *ngIf="!echartsData.statefulInspectionToggle">返回</button>

7
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn
* @LastEditTime: 2020-11-16 16:12:34
* @LastEditTime: 2020-11-17 14:13:12
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
@ -189,7 +189,10 @@ export class DeleteTwoComponent implements OnInit {
buildingFind(){
this.echartsData.dezhiorBuinding="building"
}
//返回
goBack(){
history.go(-1)
}
/**
* @name: 折线图

8
src/app/statistic-analysis/scheduled-updates/moreTable.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-05 08:59:24
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-11 14:50:29
* @LastEditTime: 2020-11-17 13:51:06
-->
<div class="table">
<p class="tableHeader">公告</p>
@ -12,17 +12,17 @@
<ng-container matColumnDef="team">
<th mat-header-cell *matHeaderCellDef>支队</th>
<td mat-cell *matCellDef="let element">{{element.team}}</td>
<td mat-cell *matCellDef="let element" style="width: 30%;">{{element.team}}</td>
</ng-container>
<ng-container matColumnDef="header">
<th mat-header-cell *matHeaderCellDef>标题</th>
<td mat-cell *matCellDef="let element">{{element.content}}</td>
<td mat-cell *matCellDef="let element" style="width: 30%;">{{element.content}}</td>
</ng-container>
<ng-container matColumnDef="time">
<th mat-header-cell *matHeaderCellDef>时间</th>
<td mat-cell *matCellDef="let element">{{element.time}}</td>
<td mat-cell *matCellDef="let element" style="width: 30%;">{{element.time}}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

32
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
Unescape View File

@ -187,6 +187,7 @@ export class publicEchartsComponent implements OnInit {
//已核查
verified () {
this.isToggle = true
this.echartsData.findShow=true
//this.echartsData.scheduledUpdatesToggle ="one"
this.echartsData.scheduledUpdatesToggle =1
}
@ -196,6 +197,7 @@ export class publicEchartsComponent implements OnInit {
this.isToggle = false
//this.echartsData.scheduledUpdatesToggle = "three"
this.echartsData.scheduledUpdatesToggle =1
this.echartsData.findShow=false
}
//返回
@ -643,9 +645,11 @@ export class notVerifiedComponent implements OnInit {
};
this.oneEcharts.setOption(option);
this.oneEcharts.on('click', (params) => {
this.echartsData.scheduledUpdatesType = 1
/* this.echartsData.scheduledUpdatesType = 1
this.echartsData.scheduledUpdatesName = params.name
this.echartsData.scheduledUpdatesToggle = 3
this.echartsData.scheduledUpdatesToggle = 3 */
/* option.yAxis.data=['浦东中队','黄浦中队','徐汇中队','长宁中队','静安中队','普陀中队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队']
this.oneEcharts.setOption(option); */
});
}
@ -757,7 +761,7 @@ export class yueDateComponent implements OnInit {
name: this.echartsData.zhuXname[1],
type: 'bar',
stack: '总数',
data: this.echartsData.zhiorBuinding=="zhi"?[68, 56, 69, 57, 23, 79, 78, 66, 49, 34, 49, 78, 45,78]:[68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45, 49, 78, 45],
data: this.echartsData.zhiorBuinding=="zhi"?[68, 56, 69, 57, 15, 79, 78, 66, 49, 34, 49, 78, 45,78]:[68, 56, 69, 57, 15, 79, 78, 66, 49, 34, 49, 78, 45, 49, 78, 45],
barWidth :'38',
},
{
@ -778,14 +782,14 @@ export class yueDateComponent implements OnInit {
name: this.echartsData.zhuXname[0],
type: 'line',
// yAxisIndex: 1,
data: this.echartsData.zhiorBuinding=="zhi"?[49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,43]:[49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,41,43,7],
data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,43],
itemStyle:{color: '#FFDC35'}
},
{
//name: '与上个月环比',
type: 'line',
// yAxisIndex: 1,
data: [45, 39, 50, 40, 40, 38, 41, 36, 30,32, 36, 38, 30,36],
data: [25, 23, 27, 24, 25, 22, 24, 20, 19,20, 20, 22, 19,22],
//itemStyle:{color: '#6be6c1'},
},
@ -793,7 +797,7 @@ export class yueDateComponent implements OnInit {
//name: '警报',
type: 'effectScatter',
//coordinateSystem: 'cartesian2d',
data: [[4,40]],
data: [[4,24]],
symbolSize:30,
itemStyle: {
normal: {
@ -1128,42 +1132,42 @@ export class detailedInformationComponent implements OnInit {
type: 'bar',
stack: '总数',
barWidth :'38',
data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45],
data: [68, 15, 69, 57, 43, 79, 78, 66, 49, 9, 49, 78, 15],
},
{
name: this.echartsData.zhuXname[2],
type: 'bar',
stack: '总数',
data: [39, 43, 49, 27, 53, 29, 38, 49, 29, 40, 40, 27, 54],
data: [39, 8, 49, 27, 53, 29, 38, 49, 29, 10, 40, 27, 24],
itemStyle:{color: '#626c91'}
},
{
name: this.echartsData.zhuXname[3],
type: 'bar',
stack: '总数',
data: [48, 42, 43, 53, 47, 39, 25, 26, 54, 34, 39, 24, 14],
data: [48, 8, 43, 53, 47, 39, 25, 26, 54, 9, 39, 24, 6],
itemStyle:{color:'#c4ebad'}
},
{
name: this.echartsData.zhuXname[0],
type: 'line',
// yAxisIndex: 1,
data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37],
data: [49, 60, 53, 47, 49, 43, 48, 41, 38, 56, 41, 43, 60],
itemStyle:{color: '#FFDC35'}
},
{
name: '与上个月环比',
//name: '与上个月环比',
type: 'line',
// yAxisIndex: 1,
data: [40, 30, 40, 30, 40, 20, 15, 5, 10,15, 6, 15, 12],
data: [25, 35, 27, 24, 25, 22, 24, 20, 19,30, 20, 22, 40],
//itemStyle:{color: '#6be6c1'},
},
{
name: '警报',
//name: '警报',
type: 'effectScatter',
//coordinateSystem: 'cartesian2d',
data: [40, 30, 40, 30, 40, 20, 15, 5, 10,15, 6, 15, 12], //2d坐标系
data: [[1,35],[9,30],[12,40]], //2d坐标系
symbolSize:30,
itemStyle: {
normal: {

Write Preview
Loading…
Cancel
Save