diff --git a/dist.rar b/dist.rar new file mode 100644 index 0000000..3be5af9 Binary files /dev/null and b/dist.rar differ diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts index 2dbabaf..879114a 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts index 9558b9a..d84f180 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts +++ b/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) { let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 - console.log(startTime) - console.log(endTime) + //console.log(startTime) + //console.log(endTime) } else if (e.selectTwoYear === e.selectOneYear) { if(e.selectEndMonth >= e.selectStartMonth) { let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 - console.log(startTime) - console.log(endTime) + //console.log(startTime) + //console.log(endTime) } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -86,8 +86,8 @@ export class AddUnitTwoTimeComponent implements OnInit { if (e.selectEndYear >= e.selectStartYear) { let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0 let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 - console.log(startTime) - console.log(endTime) + //console.log(startTime) + //console.log(endTime) } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -147,7 +147,7 @@ export class AddUnitTwoTimeComponent implements OnInit { arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) + //console.log(this.tiaoshiPao) //return tishiPao } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts index 3f15f97..c2ac6d1 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index a37fc2c..3f19eec 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } forArr = [{id:'gaoceng',name:'高层',echart:null}, diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts index eff381e..3bead7d 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } pieData = [ diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts index 01533c5..01bc388 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } forArr = [{id:'gaoceng',name:'高层',echart:null}, diff --git a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts index 4c5b642..e314561 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } //返回 diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts index 10c94cf..605e19f 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:35 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-09 14:31:22 + * @LastEditTime: 2020-11-11 10:43:58 */ import { Component, OnInit } from '@angular/core'; import { Router,ActivatedRoute } from '@angular/router'; @@ -99,7 +99,6 @@ export class DeleteThereComponent implements OnInit { arrshuzu=arrshuzu.substring(0,arrshuzu.length-1) arrshuzu+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月'] diff --git a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts index 26af019..e2b420a 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts +++ b/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+=']' this.tiaoshiPao=JSON.parse(arrshuzu) - console.log(this.tiaoshiPao) //return tishiPao } //返回 diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts index 7621ebc..85b0744 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:21:18 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-10 14:34:15 + * @LastEditTime: 2020-11-11 10:44:23 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -160,7 +160,7 @@ export class DeleteTwoComponent implements OnInit { } //按年查询 yearSubmit (e) { - console.log(this.selectType) + //console.log(this.selectType) this.headZhexian('Line','删除数量总统计',this.datanianx,this.dataniany) /* this.headZhexian('leftOne','高层',this.datanianx,this.dataniany) this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany) @@ -195,11 +195,11 @@ export class DeleteTwoComponent implements OnInit { var pagex var pagey var boxsize=[pagex,pagey] - document.onmouseover=function(e){ + /* document.onmouseover=function(e){ console.log("000") pagex=e.pageX pagey=e.pageY - } + } */ var ec = echarts as any; this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp'); this.options = { diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 8e7e826..fbfca6c 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -114,7 +114,7 @@ export class EchartsDataService { //提示框表格 tableTooltip(dataArr,title:string){ let data = dataArr - console.log(data) + //console.log(data) var res = '