diff --git a/src/app/admin/config-manage/config-manage.module.ts b/src/app/admin/config-manage/config-manage.module.ts index 7012845..cf4c9ba 100644 --- a/src/app/admin/config-manage/config-manage.module.ts +++ b/src/app/admin/config-manage/config-manage.module.ts @@ -10,7 +10,7 @@ import {RegionSelectorModule} from '../../common/region-selector/region-selector import {NgZorroAntdModule} from 'ng-zorro-antd'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import { ThirdProductComponent } from './third-product/third-product.component'; -import {AppCommonModule} from "../../app-common.module"; +import {AppCommonModule} from '../../app-common.module'; import { MemberProductComponent } from './member-product/member-product.component'; import { IntegralRebateComponent } from './integral-rebate/integral-rebate.component'; diff --git a/src/app/admin/index/index/index.component.ts b/src/app/admin/index/index/index.component.ts index ce5dc2b..d7319d7 100644 --- a/src/app/admin/index/index/index.component.ts +++ b/src/app/admin/index/index/index.component.ts @@ -62,15 +62,9 @@ export class IndexComponent implements OnInit { ngOnInit(): void { - this.http.jsonp('/areas_v3/bound/510000_full.json' , 'features').subscribe(data => { - console.log(data); - }); - - - - this.adminInfoObject = this.store.get(ADMIN_INFO_OBJECT); this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; + console.log(this.roleType); if (this.roleType === 1) { this.getIndexCount(); this.getLineCount(); @@ -362,6 +356,12 @@ export class IndexComponent implements OnInit { yAxis: { type: 'value' }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, series: [ { data: sumData, @@ -410,6 +410,7 @@ export class IndexComponent implements OnInit { data: productData }, + series: [ { data: sumData, diff --git a/src/app/services/commons.service.ts b/src/app/services/commons.service.ts index 939268a..10f6692 100644 --- a/src/app/services/commons.service.ts +++ b/src/app/services/commons.service.ts @@ -352,9 +352,9 @@ export class CommonsService { */ public dateTimeType(type: number): number { if (type === 1) { - return new Date().getDay() - 2; + return new Date().getDate() - 1; } else if (type === 3) { - return new Date().getMonth() + 1; + return new Date().getMonth(); } else { return 100; }