shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]首页年度完成情况

tangshan
邵佳豪 3 years ago
parent
672285c0f7
commit
3956bd841f
5 changed files with 34341 additions and 7780 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22923
      package-lock.json
  2. 214
      src/app/statistic-analysis/home/home.component.html
  3. 24
      src/app/statistic-analysis/home/home.component.ts
  4. 2
      src/assets/css/newStyle.css
  5. 18952
      yarn.lock

22923
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

214
src/app/statistic-analysis/home/home.component.html
Unescape View File

@ -1,40 +1,42 @@
<div class="main" style="background-color: #000D12;"> <div class="main" style="background-color: #000D12;">
<div class="main-top"> <div class="main-top">
<!-- 左侧 --> <!-- 左侧 -->
<div class="main-left"> <div class="main-left">
<div class="panel panel04" style="flex: 2.3; max-height: 410px;"> <div class="panel panel04" style="flex: 2.3; max-height: 410px;">
<div class="panel-hd"> <div class="panel-hd">
<!-- <a href="javascript:;" class="panel-more"><svg width="18" height="12" xmlns="http://www.w3.org/2000/svg"><g fill="#93FCFF" fill-rule="evenodd" opacity=".6"><path d="M0 0h18v2H0zM0 5h18v2H0zM0 10h18v2H0z"/></g></svg></a> --> <!-- <a href="javascript:;" class="panel-more"><svg width="18" height="12" xmlns="http://www.w3.org/2000/svg"><g fill="#93FCFF" fill-rule="evenodd" opacity=".6"><path d="M0 0h18v2H0zM0 5h18v2H0zM0 10h18v2H0z"/></g></svg></a> -->
</div>
<div class="panel-bd">
<div id="chartHynyxf" class="chart-item"></div>
</div>
</div> </div>
<div class="box-wrap mt plan" style="flex: 0.7;cursor: pointer;" (click)="scheduled()"> <div class="panel-bd">
<div class="panel-hd" style="padding-top: 0px;"> <div id="chartHynyxf" class="chart-item"></div>
<div class="panel-tit" style="color: white;">年度完成情况</div> </div>
</div> </div>
<div class="panel-bd" style="padding-top: 3px;"> <div class="box-wrap mt plan" style="flex: 0.7;cursor: pointer;" (click)="scheduled()">
<div class="progress-list"> <div class="panel-hd" style="padding-top: 0px;">
<div class="progress-item"> <div class="panel-tit" style="color: white;">年度完成情况</div>
<div class="progress-name">当月完成情况</div> </div>
<div class="progress"> <div class="panel-bd" style="padding-top: 3px;">
<div class="progress-num">0%</div> <div class="progress-list">
<div class="progress-bar"> <div class="progress-item">
<div style="width: 12%;" class="progress-bar-inner progress-bar-gradient"></div> <div class="progress-name">当月完成情况</div>
</div> <div class="progress">
<div class="progress-num" style="color: white;">{{completeProgress.monthlyCompleteProgress}}%</div>
<div class="progress-bar">
<div [style]="integrity(completeProgress.monthlyCompleteProgress)"
class="progress-bar-inner progress-bar-gradient"></div>
</div> </div>
</div> </div>
<div class="progress-item"> </div>
<div class="progress-name">年计划完成率</div> <div class="progress-item">
<div class="progress"> <div class="progress-name">年计划完成率</div>
<div class="progress-num">0%</div> <div class="progress">
<div class="progress-bar"> <div class="progress-num" style="color: white;">{{completeProgress.yearlyCompleteProgress}}%</div>
<div style="width: 12%;" class="progress-bar-inner progress-bar-gradient"></div> <div class="progress-bar">
</div> <div [style]="integrity(completeProgress.yearlyCompleteProgress)" class=" progress-bar-inner
progress-bar-gradient"></div>
</div> </div>
</div> </div>
<!-- <div class="progress-item"> </div>
<!-- <div class="progress-item">
<div class="progress-name">日历进度差</div> <div class="progress-name">日历进度差</div>
<div class="progress"> <div class="progress">
<div class="progress-num">82%</div> <div class="progress-num">82%</div>
@ -43,99 +45,99 @@
</div> </div>
</div> </div>
</div> --> </div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 中间 --> </div>
<div class="main-center" id="chartMap" style="z-index: 99;"> <!-- 中间 -->
<!-- 数量统计 --> <div class="main-center" id="chartMap" style="z-index: 99;">
<div class="number-area" id="number-area" style="z-index: 100;height: 125px;"> <!-- 数量统计 -->
<div class="number-box"> <div class="number-area" id="number-area" style="z-index: 100;height: 125px;">
<div class="number-tit" style="color: white;">预案编制总量</div> <div class="number-box">
<ul class="count-number"> <div class="number-tit" style="color: white;">预案编制总量</div>
<li class="count-num-item" *ngFor="let item of planNum"> <ul class="count-number">
<span class="num">{{item}}</span> <li class="count-num-item" *ngFor="let item of planNum">
</li> <span class="num">{{item}}</span>
</ul> </li>
</div> </ul>
<div class="number-item"> </div>
<div class="item-tit">重点单位总量</div> <div class="number-item">
<div class="item-txt" id="number01">{{keyUnitNum}}</div> <div class="item-tit">重点单位总量</div>
</div> <div class="item-txt" id="number01">{{keyUnitNum}}</div>
<!-- <div class="number-item"> </div>
<!-- <div class="number-item">
<div class="item-tit">数据采集总量</div> <div class="item-tit">数据采集总量</div>
<div class="item-txt" id="number02">{{dataGetNum}}</div> <div class="item-txt" id="number02">{{dataGetNum}}</div>
</div> --> </div> -->
</div> </div>
<!-- 图表 --> <!-- 图表 -->
<!-- <div class="panel panel06 mt-mlger"> <!-- <div class="panel panel06 mt-mlger">
<div class="panel-bd"> <div class="panel-bd">
<div id="chartQusj" class="chart-item"></div> <div id="chartQusj" class="chart-item"></div>
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- 右侧 --> <!-- 右侧 -->
<div class="main-right"> <div class="main-right">
<div class="box-wrap planNum" style="flex: 0.7;position: relative;"> <div class="box-wrap planNum" style="flex: 0.7;position: relative;">
<span style="position: absolute;right: 3px;top: 3px;color: white;cursor: pointer;" (click)="changeNumList()"> <span style="position: absolute;right: 3px;top: 3px;color: white;cursor: pointer;" (click)="changeNumList()">
<mat-icon>autorenew</mat-icon> <mat-icon>autorenew</mat-icon>
</span> </span>
<div class="panel-bd" style="padding-top: 13px;"> <div class="panel-bd" style="padding-top: 13px;">
<div class="total-box" *ngIf="isNumList"> <div class="total-box" *ngIf="isNumList">
<div class="total-item" (click)="threePlan()"> <div class="total-item" (click)="threePlan()">
<div class="total-name">三维预案总数</div> <div class="total-name">三维预案总数</div>
<div class="total-num">{{threePlanNum}}</div> <div class="total-num">{{threePlanNum}}</div>
</div>
<div class="total-item" (click)="twoPlan()">
<div class="total-name">二维预案总数</div>
<div class="total-num">{{twoPlanNum}}</div>
</div>
<div class="total-item" (click)="cardPlan()">
<div class="total-name">文本预案总数</div>
<div class="total-num">{{cardPlanNum}}</div>
</div>
<div class="total-item" (click)="otherPlan()">
<div class="total-name">其他预案总数</div>
<div class="total-num">{{otherPlanNum}}</div>
</div>
</div> </div>
<div class="total-box" *ngIf="!isNumList"> <div class="total-item" (click)="twoPlan()">
<div class="total-item xxx"> <div class="total-name">二维预案总数</div>
<div class="total-name">一级预案总数</div> <div class="total-num">{{twoPlanNum}}</div>
<div class="total-num">{{aPlan}}</div> </div>
</div> <div class="total-item" (click)="cardPlan()">
<div class="total-item xxx"> <div class="total-name">文本预案总数</div>
<div class="total-name">二级预案总数</div> <div class="total-num">{{cardPlanNum}}</div>
<div class="total-num">{{bPlan}}</div> </div>
</div> <div class="total-item" (click)="otherPlan()">
<div class="total-item xxx"> <div class="total-name">其他预案总数</div>
<div class="total-name">三级预案总数</div> <div class="total-num">{{otherPlanNum}}</div>
<div class="total-num">{{cPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">四级预案总数</div>
<div class="total-num">{{dPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">五级预案总数</div>
<div class="total-num">{{ePlan}}</div>
</div>
</div> </div>
</div> </div>
</div> <div class="total-box" *ngIf="!isNumList">
<div class="box-wrap mt" style="flex: 2.3; max-height: 410px;"> <div class="total-item xxx">
<div class="panel-bd"> <div class="total-name">一级预案总数</div>
<div id="chartZdgzqy" class="chart-item" style="height: 100%;"></div> <div class="total-num">{{aPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">二级预案总数</div>
<div class="total-num">{{bPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">三级预案总数</div>
<div class="total-num">{{cPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">四级预案总数</div>
<div class="total-num">{{dPlan}}</div>
</div>
<div class="total-item xxx">
<div class="total-name">五级预案总数</div>
<div class="total-num">{{ePlan}}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="box-wrap mt" style="flex: 2.3; max-height: 410px;">
<div class="main-bottom">
<div class="panel panel05">
<div class="panel-bd"> <div class="panel-bd">
<div id="chartDwsjcj" class="chart-item"></div> <div id="chartZdgzqy" class="chart-item" style="height: 100%;"></div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="main-bottom">
<div class="panel panel05">
<div class="panel-bd">
<div id="chartDwsjcj" class="chart-item"></div>
</div>
</div>
</div>
</div> </div>

24
src/app/statistic-analysis/home/home.component.ts
Unescape View File

@ -19,6 +19,7 @@ export class HomeComponent implements OnInit {
yuandata yuandata
ngOnInit() { ngOnInit() {
this.getechartsdata() this.getechartsdata()
this.getYearlyCompleteProgress()
window.setTimeout(() => { window.setTimeout(() => {
/* this.unitType() /* this.unitType()
this.unitData() this.unitData()
@ -27,6 +28,25 @@ export class HomeComponent implements OnInit {
}, 0) }, 0)
} }
//获得年度完成情况
completeProgress: any = {
monthlyCompleteProgress: '',
yearlyCompleteProgress: ''
}
getYearlyCompleteProgress() {
this.http.get('/api/StatisticsAnalysis/Companies/YearlyCompleteProgress').subscribe((data) => {
// console.log('获得年度完成情况', data)
this.completeProgress = data
})
}
integrity(width) {
let style: any = {}
style.width = width + '%';
return style
}
//更新echarts视图 //更新echarts视图
/* updateEcharts(){ /* updateEcharts(){
this.planState.resize() this.planState.resize()
@ -59,7 +79,7 @@ export class HomeComponent implements OnInit {
this.keyUnit() this.keyUnit()
} }
//获取年度完成情况数据 //获取年度完成情况数据
getYearData(){ getYearData() {
} }
@ -354,7 +374,7 @@ export class HomeComponent implements OnInit {
this.addydata = [] this.addydata = []
this.addtable = JSON.parse(JSON.stringify(this.emitService.allDate)) this.addtable = JSON.parse(JSON.stringify(this.emitService.allDate))
this.addtable[0].organizationStatistics.organizations.forEach((value, index, array) => { this.addtable[0].organizationStatistics.organizations.forEach((value, index, array) => {
if(array[index].organizationId!='5687316efa75479d96c0091a167a3b84'&&array[index].organizationName!='上海总队'){ if (array[index].organizationId != '5687316efa75479d96c0091a167a3b84' && array[index].organizationName != '上海总队') {
this.addxdata.push(array[index].organizationName) this.addxdata.push(array[index].organizationName)
this.addydata.push(array[index].count) this.addydata.push(array[index].count)
} }

2
src/assets/css/newStyle.css
Unescape View File

@ -317,7 +317,7 @@ iframe { display: block; }
.progress-list .progress-item { height: 44px; line-height: 36px; padding-top: 4px; display: flex; } .progress-list .progress-item { height: 44px; line-height: 36px; padding-top: 4px; display: flex; }
.progress-list .progress-name { width: 120px; padding-right: 10px; overflow: hidden; white-space: nowrap; font-size: 16px; color: rgba(255, 255, 255, 0.5); } .progress-list .progress-name { width: 120px; padding-right: 10px; overflow: hidden; white-space: nowrap; font-size: 16px; color: rgba(255, 255, 255, 0.5); }
.progress-list .progress-num { position: absolute; width: 0px; overflow: hidden; left: 5px; top: 0; width: 42px; white-space: nowrap; z-index: 100; font-weight: 500; font-size: 18px; line-height: 34px; } .progress-list .progress-num { position: absolute; width: 0px; overflow: hidden; left: 5px; top: 0; width: 62px; white-space: nowrap; z-index: 100; font-weight: 500; font-size: 18px; line-height: 34px; }
.progress-list .progress { border: 1px solid #fff; border-radius: 2px; position: relative; flex: 1; } .progress-list .progress { border: 1px solid #fff; border-radius: 2px; position: relative; flex: 1; }
.progress-list .progress:before { content: ""; width: 4px; height: 34px; border-radius: 100px; border: 1px solid #fff; position: absolute; left: -8px; top: 0; } .progress-list .progress:before { content: ""; width: 4px; height: 34px; border-radius: 100px; border: 1px solid #fff; position: absolute; left: -8px; top: 0; }

18952
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save