Browse Source

[完善]删除console.log

master
邵佳豪 4 years ago
parent
commit
1ee82c648a
  1. 2
      src/app/key-unit/edit-unit-info/edit-unit-info.component.html
  2. 2
      src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts
  3. 6
      src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
  4. 12
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
  5. 2
      src/app/statistic-analysis/home/home.component.html
  6. 6
      src/app/statistic-analysis/home/home.component.ts

2
src/app/key-unit/edit-unit-info/edit-unit-info.component.html

@ -53,7 +53,7 @@
</mat-tab> </mat-tab>
<mat-tab label="10.作战部署"> <mat-tab label="10.作战部署">
<ng-template matTabContent> <ng-template matTabContent>
<iframe id="main" src="http://39.106.78.171:8000/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe> <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
</ng-template> </ng-template>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>

2
src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts

@ -61,7 +61,7 @@ export class DeleteFourComponent implements OnInit {
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: (params)=>{ formatter: (params)=>{
console.log(666,params) // console.log(666,params)
return this.tableTooltip(params) return this.tableTooltip(params)
}, },
backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度 backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度

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

@ -36,7 +36,7 @@ export class DeleteThereComponent implements OnInit {
let headtext:string; let headtext:string;
let datayuex:string; let datayuex:string;
let headName:string; let headName:string;
console.log(this.activatedRoute.queryParams.subscribe) // console.log(this.activatedRoute.queryParams.subscribe)
//headtext=this.activatedRoute.queryParams["headtext"]; //headtext=this.activatedRoute.queryParams["headtext"];
this.activatedRoute.queryParams.subscribe(param=>{ this.activatedRoute.queryParams.subscribe(param=>{
headtext=param.headtext headtext=param.headtext
@ -61,7 +61,7 @@ export class DeleteThereComponent implements OnInit {
for (let i=date; i>=date-10;i--) { for (let i=date; i>=date-10;i--) {
this.years.unshift(i) this.years.unshift(i)
} }
console.log(this.years) // console.log(this.years)
} }
selectOneYear:any = (new Date()).getFullYear() //开始年份 selectOneYear:any = (new Date()).getFullYear() //开始年份
@ -163,7 +163,7 @@ export class DeleteThereComponent implements OnInit {
}] }]
}; };
this.zhutu.getZr().on('click',params=>{ this.zhutu.getZr().on('click',params=>{
console.log(params.name) // console.log(params.name)
const pointInPixel= [params.offsetX, params.offsetY]; const pointInPixel= [params.offsetX, params.offsetY];
if (this.zhutu.containPixel('grid',pointInPixel)) { if (this.zhutu.containPixel('grid',pointInPixel)) {
let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];

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

@ -109,14 +109,14 @@ export class DeleteTwoComponent 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';
@ -149,7 +149,7 @@ export class DeleteTwoComponent implements OnInit {
} }
//按年查询 //按年查询
yearSubmit (e) { yearSubmit (e) {
console.log(this.selectType) // console.log(this.selectType)
this.headZhexian('heads','删除数量总统计',this.datanianx,this.dataniany) this.headZhexian('heads','删除数量总统计',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)
@ -274,7 +274,7 @@ export class DeleteTwoComponent implements OnInit {
}] }]
}; };
this.headZx.getZr().on('click', (params) => { this.headZx.getZr().on('click', (params) => {
console.log(params.name) // console.log(params.name)
if(`${headtext}`!=="删除数量总统计"){ if(`${headtext}`!=="删除数量总统计"){
/* this.echartsData.statefulInspectionName =params.name+headtext; /* this.echartsData.statefulInspectionName =params.name+headtext;
this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); */ this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); */

2
src/app/statistic-analysis/home/home.component.html

@ -10,7 +10,7 @@
<div id="chartHynyxf" class="chart-item"></div> <div id="chartHynyxf" class="chart-item"></div>
</div> </div>
</div> </div>
<div class="box-wrap mt" style="flex: 0; height: 150px;"> <div class="box-wrap mt" style="flex: 0; height: 150px;cursor: pointer;" (click)="scheduled()">
<div class="panel-hd" style="padding-top: 0px;"> <div class="panel-hd" style="padding-top: 0px;">
<div class="panel-tit" style="color: white;">计划完成情况</div> <div class="panel-tit" style="color: white;">计划完成情况</div>
</div> </div>

6
src/app/statistic-analysis/home/home.component.ts

@ -41,7 +41,13 @@ export class HomeComponent implements OnInit {
} }
otherPlan(){ otherPlan(){
// this.router.navigate(['/planManagement/entryPlan']) // this.router.navigate(['/planManagement/entryPlan'])
}
//计划更新页面跳转
scheduled(){
this.router.navigate(['/statisticanalysis/scheduledUpdates'])
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.planState.clear() this.planState.clear()
this.planState.dispose() this.planState.dispose()

Loading…
Cancel
Save