Skip to content

R
regManage
Commit 6e044ec1 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 2de608de
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 134 deletions
src/pages/home/data-report/data-report.html
View file @ 6e044ec1
......@@ -5,99 +5,113 @@
</ion-header>
<ion-content>
<div class="echart-data">
<div class="echart-title">
<span>事业单位总览信息</span>
<ion-select [(ngModel)]="yearmonth" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getUnits()">
<ng-container *ngFor="let item of yearList">
<ion-option [value]="item">{{item}}</ion-option>
</ng-container>
</ion-select>
</div>
<ion-segment style="padding: 0 30px" [(ngModel)]="type" (ngModelChange)="switchEchart()">
<ion-segment-button value="unit">
单位数(个)
</ion-segment-button>
<ion-segment-button value="bzrs">
编制人数(人)
</ion-segment-button>
<ion-segment-button value="syrs">
实有人数(人)
</ion-segment-button>
</ion-segment>
<div class="echart">
<div #echart1 class="echart-pie"></div>
</div>
<div class="data">
<div class="table">
<table border="1">
<thead>
<tr>
<th>隶属</th>
<th>全额拨款</th>
<th>差额拨款</th>
<th>自收自支</th>
<th>合计</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of unitsInfo">
<td>{{item.geo}}</td>
<td>{{type == 'unit' ? item.unitCount1 : type == 'bzrs' ? item.bzrs1 : item.syrs1}}</td>
<td>{{type == 'unit' ? item.unitCount2 : type == 'bzrs' ? item.bzrs2 : item.syrs2}}</td>
<td>{{type == 'unit' ? item.unitCount3 : type == 'bzrs' ? item.bzrs3 : item.syrs3}}</td>
<td>{{type == 'unit' ? item.unitTotal : type == 'bzrs' ? item.bzrsTotal : item.syrsTotal}}</td>
</tr>
<tr>
<td>合计:</td>
<td>{{count.count1}}</td>
<td>{{count.count2}}</td>
<td>{{count.count3}}</td>
<td>{{count.countTotal}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="echart-title">
<span>数据报表分类</span>
<ion-select [(ngModel)]="dataType" cancelText="取消" okText="确定" placeholder="选择">
<ion-option value="事业单位总览信息">事业单位总览信息</ion-option>
<ion-option value="事业单位分类信息">事业单位分类信息</ion-option>
<ion-option value="实名制上报率">实名制上报率</ion-option>
</ion-select>
</div>
<div class="echart-data">
<div class="echart-title">
<span>事业单位分类信息</span>
<ion-select [(ngModel)]="yearmonth1" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getPie()">
<ng-container *ngFor="let item of yearList">
<ion-option [value]="item">{{item}}</ion-option>
</ng-container>
</ion-select>
</div>
<ion-segment style="padding: 0 30px" [(ngModel)]="type1" (ngModelChange)="drawPie()">
<ion-segment-button value="单位数(个)">
单位数(个)
</ion-segment-button>
<ion-segment-button value="编制人数(人)">
编制人数(人)
</ion-segment-button>
<ion-segment-button value="实有人数(人)">
实有人数(人)
</ion-segment-button>
</ion-segment>
<div class="echart">
<div #echartPie class="echart-pie"></div>
<ng-container >
<div [hidden]="dataType !== '事业单位总览信息'" class="echart-data">
<div class="echart-title">
<span>事业单位总览信息</span>
<ion-select [(ngModel)]="yearmonth" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getUnits()">
<ng-container *ngFor="let item of yearList">
<ion-option [value]="item">{{item}}</ion-option>
</ng-container>
</ion-select>
</div>
<ion-segment style="padding: 0 30px" [(ngModel)]="type" (ngModelChange)="switchEchart()">
<ion-segment-button value="unit">
单位数(个)
</ion-segment-button>
<ion-segment-button value="bzrs">
编制人数(人)
</ion-segment-button>
<ion-segment-button value="syrs">
实有人数(人)
</ion-segment-button>
</ion-segment>
<div class="echart">
<div #echart1 class="echart-pie"></div>
</div>
<div class="data">
<div class="table">
<table border="1">
<thead>
<tr>
<th>隶属</th>
<th>全额拨款</th>
<th>差额拨款</th>
<th>自收自支</th>
<th>合计</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of unitsInfo">
<td>{{item.geo}}</td>
<td>{{type == 'unit' ? item.unitCount1 : type == 'bzrs' ? item.bzrs1 : item.syrs1}}</td>
<td>{{type == 'unit' ? item.unitCount2 : type == 'bzrs' ? item.bzrs2 : item.syrs2}}</td>
<td>{{type == 'unit' ? item.unitCount3 : type == 'bzrs' ? item.bzrs3 : item.syrs3}}</td>
<td>{{type == 'unit' ? item.unitTotal : type == 'bzrs' ? item.bzrsTotal : item.syrsTotal}}</td>
</tr>
<tr>
<td>合计:</td>
<td>{{count.count1}}</td>
<td>{{count.count2}}</td>
<td>{{count.count3}}</td>
<td>{{count.countTotal}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="echart-data">
<div class="echart-title">
<span>实名制上报率</span>
</ng-container>
<ng-container >
<div [hidden]="dataType !== '事业单位分类信息'" class="echart-data">
<div class="echart-title">
<span>事业单位分类信息</span>
<ion-select [(ngModel)]="yearmonth1" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getPie()">
<ng-container *ngFor="let item of yearList">
<ion-option [value]="item">{{item}}</ion-option>
</ng-container>
</ion-select>
</div>
<ion-segment style="padding: 0 30px" [(ngModel)]="type1" (ngModelChange)="drawPie()">
<ion-segment-button value="单位数(个)">
单位数(个)
</ion-segment-button>
<ion-segment-button value="编制人数(人)">
编制人数(人)
</ion-segment-button>
<ion-segment-button value="实有人数(人)">
实有人数(人)
</ion-segment-button>
</ion-segment>
<div class="echart">
<div #echartPie class="echart-pie"></div>
</div>
</div>
<div class="echart">
<div #echart2 class="echart-pie"></div>
</ng-container>
<ng-container >
<div [hidden]="dataType !== '实名制上报率'" class="echart-data">
<div class="echart-title">
<span>实名制上报率</span>
</div>
<div class="echart">
<div #echart2 class="echart-pie"></div>
</div>
<ion-row class="data-report">
<ion-col col-4 *ngFor="let item of areaList">
<p>{{item.areaName}}</p>
<p>{{item?.sblv}}</p>
</ion-col>
</ion-row>
</div>
<ion-row class="data-report">
<ion-col col-4 *ngFor="let item of areaList">
<p>{{item.areaName}}</p>
<p>{{item?.sblv}}</p>
</ion-col>
</ion-row>
</div>
</ng-container>
</ion-content>
src/pages/home/data-report/data-report.scss
View file @ 6e044ec1
......@@ -60,7 +60,7 @@ page-data-report {
}
.echart-pie {
width: 100%;
width: 350px;
height: 180px;
}
......
src/pages/home/data-report/data-report.ts
View file @ 6e044ec1
......@@ -29,6 +29,7 @@ export class DataReportPage {
};
pieData;
dataType = '事业单位总览信息';
constructor(public navCtrl: NavController, public navParams: NavParams,
private datePipe: DatePipe,
......@@ -127,7 +128,7 @@ export class DataReportPage {
},
axisLabel: {
interval: 0,
formatter:function (value) {
formatter: function (value) {
return value.split("").join("\n")
}
}
......@@ -194,7 +195,7 @@ export class DataReportPage {
}),
axisLabel: {
interval: 0,
formatter:function (value) {
formatter: function (value) {
return value.split("").join("\n")
}
}
......@@ -246,10 +247,48 @@ export class DataReportPage {
if (this.type1 == '实有人数(人)') {
keyword = 'syrs';
}
const data = [
{
name: '行政类',
value: this.sum(this.pieData, `${keyword}1`)
},
{
name: '参照行政类',
value: this.sum(this.pieData, `${keyword}2`)
},
{
name: '公益一类',
value: this.sum(this.pieData, `${keyword}3`)
},
{
name: '公益二类',
value: this.sum(this.pieData, `${keyword}4`)
},
{
name: '经营类',
value: this.sum(this.pieData, `${keyword}5`)
},
{
name: '暂缓分类',
value: this.sum(this.pieData, `${keyword}6`)
}
];
let pieData = this.pieData;
let option1 = {
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
formatter(value) {
let params;
if (value.name == '行政类') params = `${keyword}1`;
if (value.name == '参照行政类') params = `${keyword}2`;
if (value.name == '公益一类') params = `${keyword}3`;
if (value.name == '公益二类') params = `${keyword}4`;
if (value.name == '经营类') params = `${keyword}5`;
if (value.name == '暂缓分类') params = `${keyword}6`;
let QuShuToTal = value.value - pieData[0][params];
let str = `${value.name}:${value.value}(${value.percent}%)<br>市区:${pieData[0][params]}<br>区属:${QuShuToTal}`;
return str;
}
},
series: [
{
......@@ -257,32 +296,7 @@ export class DataReportPage {
type: 'pie',
radius: '55%',
center: ['50%', '60%'],
data: [
{
name: '行政类',
value: this.sum(this.pieData, `${keyword}1`)
},
{
name: '参照行政类',
value: this.sum(this.pieData, `${keyword}2`)
},
{
name: '公益一类',
value: this.sum(this.pieData, `${keyword}3`)
},
{
name: '公益二类',
value: this.sum(this.pieData, `${keyword}4`)
},
{
name: '经营类',
value: this.sum(this.pieData, `${keyword}5`)
},
{
name: '暂缓分类',
value: this.sum(this.pieData, `${keyword}6`)
}
],
data: data,
emphasis: {
itemStyle: {
shadowBlur: 10,
......
src/pages/home/report-info/info-detail/info-detail.html
View file @ 6e044ec1
......@@ -68,12 +68,6 @@
</div>
</div>
<div class="item-box">
<div class="left">编制数:</div>
<div class="right">
<span>{{ infoObj.bzrs}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{ infoObj.pzwh}}</span>
......@@ -86,15 +80,15 @@
</div>
</div>
<div class="item-box">
<div class="left">最近上报在编人数({{nowDate}}):</div>
<div class="left">编制数:</div>
<div class="right">
<span>{{ infoObj.syrs}}现有人数({{ infoObj.syrs_now}})</span>
<span>{{ infoObj.bzrs}}</span>
</div>
</div>
<div class="item-box">
<div class="left">原事证号:</div>
<div class="left">最近上报在编人数({{nowDate}}):</div>
<div class="right">
<span>{{ infoObj.zsh}}</span>
<span>{{ infoObj.syrs}}现有人数({{ infoObj.syrs_now}})</span>
</div>
</div>
<div class="item-box">
......@@ -198,6 +192,12 @@
</div>
</div>
<div class="item-box">
<div class="left">机构性质:</div>
<div class="right">
<span>{{infoObj?.jgxzStr || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">负责人:</div>
<div class="right">
<span>{{infoObj?.fzr || "-"}}</span>
......
src/pages/home/report-info/info-list/info-list.html
View file @ 6e044ec1
......@@ -4,7 +4,7 @@
<ion-buttons end>
<button ion-button icon-only class="toolbar-signUp">
<ion-select [(ngModel)]="option.type" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getList()">
(ngModelChange)="changeType()">
<ng-container *ngFor="let item of option.list">
<ion-option [value]="item.type">{{item.name}}</ion-option>
</ng-container>
......
src/pages/home/report-info/info-list/info-list.ts
View file @ 6e044ec1
......@@ -35,6 +35,11 @@ export class InfoListPage {
// this.getList();
}
changeType() {
this.info.list = [];
this.info.search = '';
}
getList(event?: any) {
this.option.type === '1' ? this.getUnit(event) : this.getCreditor(event);
}
......
src/pages/news/news.scss
View file @ 6e044ec1
......@@ -25,7 +25,6 @@ page-news {
.left {
width: 20%;
text-align: right;
color: #666666;
}
......
src/pages/news/news.ts
View file @ 6e044ec1
......@@ -41,7 +41,7 @@ export class NewsPage {
)
this.newSer.rgtxList(data).subscribe(
(res) => {
this.rgtxList = res.rgtxList;
this.rgtxList = res.dqtxList;
}
)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment