Skip to content

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

version 0.0.2

parent 37f6d185
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 75 deletions
src/app/app.constants.ts
View file @ ed5eae0f
import * as Mock from 'mockjs'; // export const SERVER_API_URL = '/shfrdj'; export const SERVER_API_URL = 'http://218.242.131.175/shfrdj'; // export const SERVER_API_WEB = 'shfrdjweb'; export const SERVER_API_WEB = 'http://218.242.131.175/shfrdjweb'; Mock.setup( { timeout:50, } ); export const institutionalNature = [ {label:'挂牌机构',value:'8'}, {label:'内设机构',value:'7'}, {label:'派驻机关',value:'6'}, {label:'派出机构',value:'5'}, {label:'分支机构',value:'4'}, {label:'临时机构',value:'3'}, {label:'议事协调机构',value:'2'}, {label:'挂靠机构',value:'1'}, ] import * as Mock from 'mockjs'; export const SERVER_API_URL = '/shfrdj';// export const SERVER_API_URL = 'http://218.242.131.175/shfrdj'; export const SERVER_API_WEB = 'shfrdjweb'; // export const SERVER_API_WEB = 'http://218.242.131.175/shfrdjweb'; Mock.setup( { timeout:50, } ); export const institutionalNature = [ {label:'挂牌机构',value:'8'}, {label:'内设机构',value:'7'}, {label:'派驻机关',value:'6'}, {label:'派出机构',value:'5'}, {label:'分支机构',value:'4'}, {label:'临时机构',value:'3'}, {label:'议事协调机构',value:'2'}, {label:'挂靠机构',value:'1'}, ]
\ No newline at end of file \ No newline at end of file
......
src/pages/home/data-report/data-report.html
View file @ ed5eae0f
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
<div class="data"> <div class="data">
<div> <div>
<p>单位数</p> <p>单位数</p>
<p>7749</p> <p>{{unitsInfo?.hj.unitcount}}</p>
</div> </div>
<div> <div>
<p>编制数</p> <p>编制数</p>
<p>524845</p> <p>{{unitsInfo?.hj.bianzhicount}}</p>
</div> </div>
<div> <div>
<p>实有数</p> <p>实有数</p>
<p>429171</p> <p>{{unitsInfo?.hj.shiyoucount}}</p>
</div> </div>
</div> </div>
</div> </div>
......
src/pages/home/data-report/data-report.ts
View file @ ed5eae0f
This diff is collapsed.
src/pages/home/home.html
View file @ ed5eae0f
...@@ -50,15 +50,15 @@ ...@@ -50,15 +50,15 @@
<div class="data"> <div class="data">
<div> <div>
<p>单位数</p> <p>单位数</p>
<p>8776</p> <p>{{unitsInfo?.hj.unitcount}}</p>
</div> </div>
<div> <div>
<p>编制数</p> <p>编制数</p>
<p>242567</p> <p>{{unitsInfo?.hj.bianzhicount}}</p>
</div> </div>
<div> <div>
<p>实有数</p> <p>实有数</p>
<p>232345</p> <p>{{unitsInfo?.hj.shiyoucount}}</p>
</div> </div>
</div> </div>
</div> </div>
......
src/pages/home/home.ts
View file @ ed5eae0f
...@@ -42,7 +42,7 @@ export class HomePage { ...@@ -42,7 +42,7 @@ export class HomePage {
private mineSer: MineService, private tabSer: TabService, private inAppBrowser: InAppBrowser, private mineSer: MineService, private tabSer: TabService, private inAppBrowser: InAppBrowser,
private renderer: Renderer2) { private renderer: Renderer2) {
this.mineInfo = this.globle.userObj; this.mineInfo = this.globle.userObj;
this.yearmonth = this.datePipe.transform(Date.now(), "yyyy-MM"); this.yearmonth = new Date().getFullYear() +'-'+new Date().getMonth();
} }
ionViewDidLoad() { ionViewDidLoad() {
...@@ -55,73 +55,80 @@ export class HomePage { ...@@ -55,73 +55,80 @@ export class HomePage {
yearmonth: this.yearmonth, yearmonth: this.yearmonth,
}; };
this.echartData = { this.homeSer.units(data).subscribe(
grid: { (res) => {
left: "8%", if (res.code == 0) {
right: "10%", this.unitsInfo = res.list;
width: "90%", this.echartData = {
height: "70%", grid: {
containLabel: true left: "8%",
}, right: "10%",
tooltip: { width: "90%",
trigger: 'axis', height: "70%",
axisPointer: { containLabel: true
type: 'cross', },
crossStyle: { tooltip: {
color: '#999' trigger: 'axis',
} axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
}
},
legend: {
data: ['实际在编人员数', '编制数', '单位数']
},
xAxis: [
{
type: 'category',
data: [res.list.hj.areaName, res.list.qx.areaName, res.list.sh.areaName],
axisPointer: {
type: 'shadow'
}
}
],
yAxis: [
{
type: 'value',
name: '人数',
axisLabel: {
formatter: '{value} 人'
}
},
{
type: 'value',
name: '单位数',
axisLabel: {
formatter: '{value} 个'
}
}
],
series: [
{
name: '实际在编人员数',
type: 'bar',
data: [res.list.hj.shiyoucount, res.list.qx.shiyoucount, res.list.sh.shiyoucount],
color: ['#5baad2']
},
{
name: '编制数',
type: 'bar',
data: [res.list.hj.bianzhicount, res.list.qx.bianzhicount, res.list.sh.bianzhicount],
color: ['#6de0d2']
},
{
name: '单位数',
type: 'bar',
yAxisIndex: 1,
data: [res.list.hj.unitcount, res.list.qx.unitcount, res.list.sh.unitcount],
color: ['#feda66']
}
]
};
} }
}, }
legend: { )
data: ['实际在编人员数', '编制数', '单位数']
},
xAxis: [
{
type: 'category',
data: ['9月', '10月', '11月'],
axisPointer: {
type: 'shadow'
}
}
],
yAxis: [
{
type: 'value',
name: '人数',
axisLabel: {
formatter: '{value} 人'
}
},
{
type: 'value',
name: '单位数',
axisLabel: {
formatter: '{value} 个'
}
}
],
series: [
{
name: '实际在编人员数',
type: 'bar',
data: [221345, 222456, 232345],
color: ['#5baad2']
},
{
name: '编制数',
type: 'bar',
data: [222345, 233456, 242567],
color: ['#6de0d2']
},
{
name: '单位数',
type: 'line',
yAxisIndex: 1,
data: [6271, 7913, 8776],
color: ['#feda66']
}
]
};
} }
......
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