diff --git a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html index a940ac0..bd900df 100644 --- a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html +++ b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html @@ -53,7 +53,7 @@ - + diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts index f46228b..798bacc 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts @@ -89,7 +89,7 @@ export class DeleteFourComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - console.log(666,params) + // console.log(666,params) return this.tableTooltip(params) }, position: this.data.tableTooltipNoShow2 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 554344f..fbaddb8 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 @@ -38,7 +38,7 @@ export class DeleteThereComponent implements OnInit { //let headtext:string; let datayuex:string; let headName:string; - console.log(this.activatedRoute.queryParams.subscribe) + // console.log(this.activatedRoute.queryParams.subscribe) //headtext=this.activatedRoute.queryParams["headtext"]; this.activatedRoute.queryParams.subscribe(param=>{ this.headtext=param.headtext @@ -63,7 +63,7 @@ export class DeleteThereComponent implements OnInit { for (let i=date; i>=date-10;i--) { this.years.unshift(i) } - console.log(this.years) + // console.log(this.years) } selectOneYear:any = (new Date()).getFullYear() //开始年份 @@ -197,7 +197,7 @@ export class DeleteThereComponent implements OnInit { }] }; this.zhutu.getZr().on('click',params=>{ - console.log(params.name) + // console.log(params.name) const pointInPixel= [params.offsetX, params.offsetY]; if (this.zhutu.containPixel('grid',pointInPixel)) { let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; 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 5e4284d..1e0a65e 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-09-09 11:11:46 + * @LastEditTime: 2020-09-10 10:56:58 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -125,14 +125,14 @@ export class DeleteTwoComponent 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'; @@ -275,7 +275,7 @@ export class DeleteTwoComponent implements OnInit { }] }; this.headZx.getZr().on('click', (params) => { - console.log(params.name) + // console.log(params.name) if(`${headtext}`!=="删除数量总统计"){ /* this.echartsData.statefulInspectionName =params.name+headtext; this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); */ diff --git a/src/app/statistic-analysis/home/home.component.html b/src/app/statistic-analysis/home/home.component.html index e06e0c6..f6b2876 100644 --- a/src/app/statistic-analysis/home/home.component.html +++ b/src/app/statistic-analysis/home/home.component.html @@ -10,7 +10,7 @@
-
+
计划完成情况
diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index 4943a31..6bc8f4b 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -41,7 +41,13 @@ export class HomeComponent implements OnInit { } otherPlan(){ // this.router.navigate(['/planManagement/entryPlan']) + } + + //计划更新页面跳转 + scheduled(){ + this.router.navigate(['/statisticanalysis/scheduledUpdates']) } + ngOnDestroy(): void { this.planState.clear() this.planState.dispose()