Browse Source

[修改]统计分析打印清理

dev
chenjingyu 4 years ago
parent
commit
a1d59fd0f5
  1. BIN
      dist.rar
  2. 1
      src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts
  3. 14
      src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts
  4. 1
      src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts
  5. 1
      src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts
  6. 1
      src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts
  7. 1
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
  8. 1
      src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts
  9. 3
      src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
  10. 1
      src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts
  11. 8
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
  12. 4
      src/app/statistic-analysis/echarts-data.service.ts
  13. 2
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
  14. 2
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
  15. 10
      src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
  16. 1
      src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts
  17. 1
      src/app/statistic-analysis/state/page-there/page-there.component.ts
  18. 1
      src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts
  19. 12
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

BIN
dist.rar

Binary file not shown.

1
src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts

@ -93,7 +93,6 @@ export class AddUnitThreeBarDetailsComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }

14
src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts

@ -58,14 +58,14 @@ export class AddUnitTwoTimeComponent implements OnInit {
if (e.selectTwoYear > e.selectOneYear) { if (e.selectTwoYear > e.selectOneYear) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else if (e.selectTwoYear === e.selectOneYear) { } else if (e.selectTwoYear === e.selectOneYear) {
if(e.selectEndMonth >= e.selectStartMonth) { if(e.selectEndMonth >= e.selectStartMonth) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else { } else {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -86,8 +86,8 @@ export class AddUnitTwoTimeComponent implements OnInit {
if (e.selectEndYear >= e.selectStartYear) { if (e.selectEndYear >= e.selectStartYear) {
let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else { } else {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -147,7 +147,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao) //console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }

1
src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts

@ -63,7 +63,6 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }

1
src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts

@ -121,7 +121,6 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
forArr = [{id:'gaoceng',name:'高层',echart:null}, forArr = [{id:'gaoceng',name:'高层',echart:null},

1
src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts

@ -121,7 +121,6 @@ export class BuildingTypeTwoForwardComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
pieData = [ pieData = [

1
src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts

@ -117,7 +117,6 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
forArr = [{id:'gaoceng',name:'高层',echart:null}, forArr = [{id:'gaoceng',name:'高层',echart:null},

1
src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts

@ -82,7 +82,6 @@ export class DeleteThereLineDetailsComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
//返回 //返回

3
src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-02 16:22:35 * @Date: 2020-09-02 16:22:35
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-11-09 14:31:22 * @LastEditTime: 2020-11-11 10:43:58
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router,ActivatedRoute } from '@angular/router'; import { Router,ActivatedRoute } from '@angular/router';
@ -99,7 +99,6 @@ export class DeleteThereComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月'] date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月']

1
src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts

@ -80,7 +80,6 @@ export class DeleteTwoNewaddComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
//返回 //返回

8
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-02 16:21:18 * @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-11-10 14:34:15 * @LastEditTime: 2020-11-11 10:44:23
*/ */
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -160,7 +160,7 @@ export class DeleteTwoComponent implements OnInit {
} }
//按年查询 //按年查询
yearSubmit (e) { yearSubmit (e) {
console.log(this.selectType) //console.log(this.selectType)
this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany) this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany)
/* this.headZhexian('leftOne','',this.datanianx,this.dataniany) /* this.headZhexian('leftOne','',this.datanianx,this.dataniany)
this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany) this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany)
@ -195,11 +195,11 @@ export class DeleteTwoComponent implements OnInit {
var pagex var pagex
var pagey var pagey
var boxsize=[pagex,pagey] var boxsize=[pagex,pagey]
document.onmouseover=function(e){ /* document.onmouseover=function(e){
console.log("000") console.log("000")
pagex=e.pageX pagex=e.pageX
pagey=e.pageY pagey=e.pageY
} } */
var ec = echarts as any; var ec = echarts as any;
this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp'); this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp');
this.options = { this.options = {

4
src/app/statistic-analysis/echarts-data.service.ts

@ -114,7 +114,7 @@ export class EchartsDataService {
//提示框表格 //提示框表格
tableTooltip(dataArr,title:string){ tableTooltip(dataArr,title:string){
let data = dataArr let data = dataArr
console.log(data) //console.log(data)
var res = '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:26px;text-align: center;display:block;">'+title+'</span></div>' var res = '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:26px;text-align: center;display:block;">'+title+'</span></div>'
res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px; color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >'; res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px; color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
res+='<thead><tr>'; res+='<thead><tr>';
@ -430,7 +430,7 @@ export class EchartsDataService {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
tiaoshiPao=JSON.parse(arrshuzu) tiaoshiPao=JSON.parse(arrshuzu)
console.log(tiaoshiPao) //console.log(tiaoshiPao)
return tiaoshiPao return tiaoshiPao
} }

2
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-11-03 10:19:24 * @Date: 2020-11-03 10:19:24
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-11-10 13:55:45 * @LastEditTime: 2020-11-11 09:01:21
--> -->
<!-- <div class="content"> <!-- <div class="content">
<div class="center" id="center"></div> <div class="center" id="center"></div>

2
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss

@ -57,7 +57,7 @@
.echartsbox{ .echartsbox{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: hidden;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
//justify-content:center; //justify-content:center;

10
src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@ -25,7 +25,7 @@ export class ScheduledUpdatesComponent implements OnInit {
ngOnDestroy () { ngOnDestroy () {
this.example.clear() this.example.clear()
//this.example.dispose() this.example.dispose()
} }
example:any; example:any;
@ -130,7 +130,7 @@ export class ScheduledUpdatesComponent implements OnInit {
}else{this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"]} }else{this.echartsData.zhuXname=["平均值","维护中","维护通过审核","未维护"]}
this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts'); this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts');
} }
console.log(this.echartsData.scheduledUpdatesToggle) //console.log(this.echartsData.scheduledUpdatesToggle)
}); });
} }
@ -200,7 +200,7 @@ export class publicEchartsComponent implements OnInit {
//返回 //返回
goBack () { goBack () {
this.echartsData.scheduledUpdatesToggle-- this.echartsData.scheduledUpdatesToggle--
console.log(this.echartsData.scheduledUpdatesToggle) //console.log(this.echartsData.scheduledUpdatesToggle)
} }
//更多 窗口 //更多 窗口
@ -478,7 +478,7 @@ export class verifiedComponent implements OnInit {
this.echartsData.scheduledUpdatesName = this.months[index] this.echartsData.scheduledUpdatesName = this.months[index]
//this.echartsData.scheduledUpdatesToggle = false //this.echartsData.scheduledUpdatesToggle = false
this.echartsData.scheduledUpdatesXName=params.name this.echartsData.scheduledUpdatesXName=params.name
console.log(this.echartsData.scheduledUpdatesXName) //console.log(this.echartsData.scheduledUpdatesXName)
}); });
}); });
} }
@ -765,7 +765,7 @@ export class yueDateComponent implements OnInit {
let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
/*事件处理代码书写位置*/ /*事件处理代码书写位置*/
this.echartsData.scheduledUpdatesType = 0 this.echartsData.scheduledUpdatesType = 0
console.log(option.xAxis) //console.log(option.xAxis)
this.echartsData.scheduledUpdatesName = option.xAxis[0].data[xIndex] this.echartsData.scheduledUpdatesName = option.xAxis[0].data[xIndex]
this.echartsData.scheduledUpdatesToggle = 3 this.echartsData.scheduledUpdatesToggle = 3
//this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex] //this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex]

1
src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts

@ -81,7 +81,6 @@ export class PageThereYearComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
//返回 //返回

1
src/app/statistic-analysis/state/page-there/page-there.component.ts

@ -94,7 +94,6 @@ export class PageThereComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月'] date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月']

1
src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts

@ -98,7 +98,6 @@ export class PageTwoNameComponent implements OnInit {
arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu=arrshuzu.substring(0,arrshuzu.length-1)
arrshuzu+=']' arrshuzu+=']'
this.tiaoshiPao=JSON.parse(arrshuzu) this.tiaoshiPao=JSON.parse(arrshuzu)
console.log(this.tiaoshiPao)
//return tishiPao //return tishiPao
} }
addEchart addEchart

12
src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@ -88,14 +88,14 @@ export class PageTwoTimeComponent implements OnInit {
if (e.selectTwoYear > e.selectOneYear) { if (e.selectTwoYear > e.selectOneYear) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else if (e.selectTwoYear === e.selectOneYear) { } else if (e.selectTwoYear === e.selectOneYear) {
if(e.selectEndMonth >= e.selectStartMonth) { if(e.selectEndMonth >= e.selectStartMonth) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else { } else {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -119,8 +119,8 @@ export class PageTwoTimeComponent implements OnInit {
if (e.selectEndYear >= e.selectStartYear) { if (e.selectEndYear >= e.selectStartYear) {
let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime) //console.log(startTime)
console.log(endTime) //console.log(endTime)
} else { } else {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';

Loading…
Cancel
Save