Skip to content

C
civil-front
Commit cedaec7b by 苏咏卓
Options

接口对接

parent 946b4f93
Showing with 254 additions and 153 deletions
src/api/unified/unified.js
...@@ -23,6 +23,8 @@ export const getAreaUnderSoorganStatsList = data => { ...@@ -23,6 +23,8 @@ export const getAreaUnderSoorganStatsList = data => {
}) })
} }
getAreaNursingStatsList
/** -------------------- 婚姻 -------------------- **/ /** -------------------- 婚姻 -------------------- **/
//获取地区结婚离婚人数列表 //获取地区结婚离婚人数列表
export const getAreaUnderMarriageStatsList = data => { export const getAreaUnderMarriageStatsList = data => {
...@@ -151,6 +153,17 @@ export const getAgencyUnderChildStatsList = data => { ...@@ -151,6 +153,17 @@ export const getAgencyUnderChildStatsList = data => {
}) })
} }
/** -------------------- 殡葬 -------------------- **/
//统计该区域的殡葬火化量
export const getCremationStats = data => {
return request({
url: 'portal/admin/stats/getCremationStats',
method: 'POST',
data
})
}
/** -------------------- 两项补贴 -------------------- **/ /** -------------------- 两项补贴 -------------------- **/
//获取区域残疾发放统计 //获取区域残疾发放统计
export const getAreaDisabledIssueStats = data => { export const getAreaDisabledIssueStats = data => {
......
src/views/unified/tapSwitch/mechanism.vue
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<script> <script>
import * as echarts from "echarts"; import * as echarts from "echarts";
import { getSoorganStats,getAreaUnderSoorganStatsList,getAreaNursingStatsList } from "@/api/unified/unified"; import { getSoorganStats,getAreaUnderSoorganStatsList,getAreaNursingStatsList,getAgencyPercentageStats } from "@/api/unified/unified";
export default { export default {
data() { data() {
return { return {
...@@ -172,13 +172,16 @@ export default { ...@@ -172,13 +172,16 @@ export default {
], ],
soorganStats: {}, soorganStats: {},
areaUnderSoorganStatsList:{}, areaUnderSoorganStatsList:{},
areaNursingStatsList:{} areaNursingStatsList:{},
agencyPercentageStats:[],
welfareHomeName: [],
}; };
}, },
created() { created() {
this.getSoorganStatsFun(); this.getSoorganStatsFun();
this.getAreaUnderSoorganStatsListFun() this.getAreaUnderSoorganStatsListFun()
this.getAreaNursingStatsListFun() this.getAreaNursingStatsListFun()
this.getAgencyPercentageStatsFun()
}, },
methods: { methods: {
getSoorganStatsFun() { getSoorganStatsFun() {
...@@ -202,6 +205,18 @@ export default { ...@@ -202,6 +205,18 @@ export default {
}) })
}, },
getAgencyPercentageStatsFun() {
getAgencyPercentageStats({}).then((res) => {
console.log(res, "获取区域机构占比");
this.agencyPercentageStats = res.data;
res.data.forEach((item) => {
this.welfareHomeName.push(item.name);
});
console.log(this.welfareHomeName);
this.childrenFun();
});
},
//社会组织柱形图 //社会组织柱形图
sociologyFun() { sociologyFun() {
var chartDom = document.getElementById("sociology"); var chartDom = document.getElementById("sociology");
...@@ -526,23 +541,18 @@ export default { ...@@ -526,23 +541,18 @@ export default {
trigger: "item", trigger: "item",
formatter: "{a} <br/>{b} : {c} ({d}%)", formatter: "{a} <br/>{b} : {c} ({d}%)",
}, },
legend: { // legend: {
bottom: 10, // bottom: 10,
left: "center", // left: "center",
data: ["西凉", "益州", "兖州", "荆州"], // data: this.welfareHomeName,
}, // },
series: [ series: [
{ {
type: "pie", type: "pie",
radius: "65%", radius: "65%",
center: ["50%", "50%"], center: ["50%", "50%"],
selectedMode: "single", selectedMode: "single",
data: [ data: this.agencyPercentageStats,
{ value: 735, name: "荆州" },
{ value: 510, name: "兖州" },
{ value: 434, name: "益州" },
{ value: 335, name: "西凉" },
],
emphasis: { emphasis: {
itemStyle: { itemStyle: {
shadowBlur: 10, shadowBlur: 10,
...@@ -561,7 +571,6 @@ export default { ...@@ -561,7 +571,6 @@ export default {
setTimeout(() => { setTimeout(() => {
this.sociologyFun(); this.sociologyFun();
this.pensionFun(); this.pensionFun();
this.childrenFun();
}, 1000); }, 1000);
}, },
}; };
......
src/views/unified/tapSwitch/population.vue
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="size24">1000</div> <div class="size24Info">1000</div>
<div class="size16">事实无人领养</div> <div class="size16Info">事实无人领养</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
}) })
}, },
//儿童机构柱形图 //儿童福利统计
orphanFun() { orphanFun() {
var chartDom = document.getElementById("orphan"); var chartDom = document.getElementById("orphan");
var myChart = echarts.init(chartDom, "dark"); var myChart = echarts.init(chartDom, "dark");
...@@ -243,7 +243,7 @@ export default { ...@@ -243,7 +243,7 @@ export default {
}, },
yAxis: { yAxis: {
type: "category", type: "category",
data: ["巴西", "印尼", "美国", "印度", "桂林", "南宁"], data: this.agencyChildStatsList.areaList,
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: "#FFFFFF", color: "#FFFFFF",
...@@ -267,7 +267,7 @@ export default { ...@@ -267,7 +267,7 @@ export default {
{ {
name: "孤儿", name: "孤儿",
type: "bar", type: "bar",
data: [18203, 23489, 29034, 104970, 131744, 63023], data: this.agencyChildStatsList.orphanNumList,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#3167ff", color: "#3167ff",
...@@ -280,12 +280,12 @@ export default { ...@@ -280,12 +280,12 @@ export default {
{ {
name: "事实无人领养", name: "事实无人领养",
type: "bar", type: "bar",
data: [19325, 23438, 31000, 121594, 134141, 68180], data: this.agencyChildStatsList.factUnadoptedNumList,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#ff4444", color: "#C1BDBD",
lineStyle: { lineStyle: {
color: "#ff4444", color: "#C1BDBD",
}, },
}, },
}, },
...@@ -791,6 +791,14 @@ export default { ...@@ -791,6 +791,14 @@ export default {
.size16 { .size16 {
font-size: 16; font-size: 16;
} }
.size24Info {
font-size: 24px;
color: #C1BDBD;
}
.size16Info {
font-size: 16;
color: #C1BDBD;
}
.rescue { .rescue {
text-align: center; text-align: center;
color: #fff; color: #fff;
......
src/views/unified/tapSwitch/provide.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="text">火化总数</div> <div class="text">火化总数</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum">123456</div> <div class="textNum">{{cremationStats.cremationSum}}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="texts">火化率</div> <div class="texts">火化率</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNums">88</div> <div class="textNums">{{cremationStats.cremationRate}}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">%</div> <div class="text">%</div>
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
<script> <script>
import * as echarts from "echarts"; import * as echarts from "echarts";
import { getCremationStats } from "@/api/unified/unified";
export default { export default {
data() { data() {
return { return {
...@@ -117,10 +118,20 @@ export default { ...@@ -117,10 +118,20 @@ export default {
dates:"2020-12-2" dates:"2020-12-2"
}, },
], ],
cremationStats:{}
}; };
}, },
created() {}, created() {
this.getCremationStatsFun()
},
methods: { methods: {
getCremationStatsFun(){
getCremationStats({}).then(res =>{
console.log(res,'统计该区域的殡葬火化量')
this.cremationStats = res.data
})
},
//机构占比 //机构占比
proportionFun() { proportionFun() {
var chartDom = document.getElementById("proportion"); var chartDom = document.getElementById("proportion");
......
src/views/unified/tapSwitch/socialOrganization.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="text">社会组织总数</div> <div class="text">社会组织总数</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="yellowNum">{{soorganStats.totalNum}}</div> <div class="yellowNum">{{ soorganStats.totalNum }}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="textLeft">社团</div> <div class="textLeft">社团</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum">{{soorganStats.leagueNum}}</div> <div class="textNum">{{ soorganStats.leagueNum }}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="textLeft">民非</div> <div class="textLeft">民非</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum">{{soorganStats.minFeiNum}}</div> <div class="textNum">{{ soorganStats.minFeiNum }}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="textLefts">基金会</div> <div class="textLefts">基金会</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum">{{soorganStats.foundationNum}}</div> <div class="textNum">{{ soorganStats.foundationNum }}</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="18" :offset="6"> <el-col :span="18" :offset="6">
<div class="classification"> <div class="classification">
<div class="classificationText">社团：</div> <div class="classificationText">社团：</div>
<div class="numText">{{ soorganStats.leagueNum }}</div> <div class="numText">{{ soorganStats.leagueNum }}</div>
</div> </div>
</el-col> </el-col>
...@@ -88,12 +88,14 @@ ...@@ -88,12 +88,14 @@
<el-col :span="18" :offset="6"> <el-col :span="18" :offset="6">
<div class="classification"> <div class="classification">
<div class="classificationText">基金会：</div> <div class="classificationText">基金会：</div>
<div class="numText">{{ soorganStats.foundationNum }}</div> <div class="numText">
{{ soorganStats.foundationNum }}
</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="18">
<div id="annualStatistics" class="annualStatistics"></div> <div id="annualStatistics" class="annualStatistics"></div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -117,7 +119,11 @@ ...@@ -117,7 +119,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="地区" align="center"> <el-table-column prop="name" label="地区" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="组织名称/代码" align="center"> <el-table-column
prop="address"
label="组织名称/代码"
align="center"
>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -135,7 +141,11 @@ ...@@ -135,7 +141,11 @@
<script> <script>
import * as echarts from "echarts"; import * as echarts from "echarts";
import { getSoorganStats,getSoorganPercentageStats } from "@/api/unified/unified"; import {
getSoorganStats,
getSoorganPercentageStats,
getAreaUnderSoorganStatsList,
} from "@/api/unified/unified";
export default { export default {
data() { data() {
return { return {
...@@ -151,35 +161,42 @@ export default { ...@@ -151,35 +161,42 @@ export default {
address: "上海市普陀区金沙江路 1517 弄", address: "上海市普陀区金沙江路 1517 弄",
}, },
], ],
soorganStats:{}, soorganStats: {},
SoorganPercentageStats:[], SoorganPercentageStats: [],
placeNames:[], placeNames: [],
soorganStats:{} soorganStats: {},
areaUnderSoorganStatsList: {},
}; };
}, },
created() { created() {
this.getSoorganStatsFun() this.getSoorganStatsFun();
this.getSoorganPercentageStatsFun() this.getSoorganPercentageStatsFun();
this.getAreaUnderSoorganStatsListFun();
}, },
methods: { methods: {
getSoorganStatsFun(){ getSoorganStatsFun() {
getSoorganStats({}).then(res =>{ getSoorganStats({}).then((res) => {
console.log(res,'获取社会机构统计') console.log(res, "获取社会机构统计");
this.soorganStats = res.data this.soorganStats = res.data;
}) });
}, },
getSoorganPercentageStatsFun(){ getSoorganPercentageStatsFun() {
getSoorganPercentageStats({}).then(res =>{ getSoorganPercentageStats({}).then((res) => {
console.log(res.data,'获取社会机构区域占比统计') console.log(res.data, "获取社会机构区域占比统计");
this.SoorganPercentageStats = res.data this.SoorganPercentageStats = res.data;
res.data.forEach(item => { res.data.forEach((item) => {
this.placeNames.push( this.placeNames.push(item.name);
item.name
)
}); });
console.log(this.placeNames); console.log(this.placeNames);
}) });
},
getAreaUnderSoorganStatsListFun() {
getAreaUnderSoorganStatsList({}).then((res) => {
console.log(res, "获取地区下面社会机构统计列表");
this.areaUnderSoorganStatsList = res.data;
});
}, },
//机构占比 //机构占比
...@@ -329,7 +346,7 @@ export default { ...@@ -329,7 +346,7 @@ export default {
}, },
}, },
legend: { legend: {
data: ["Forest", "Steppe", "Desert", "Wetland"], data: ["社团", "民非", "基金会"],
}, },
toolbox: { toolbox: {
show: true, show: true,
...@@ -341,7 +358,7 @@ export default { ...@@ -341,7 +358,7 @@ export default {
{ {
type: "category", type: "category",
axisTick: { show: false }, axisTick: { show: false },
data: ["2012", "2013", "2014", "2015", "2016"], data: this.areaUnderSoorganStatsList.areaList,
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: "#FFFFFF", color: "#FFFFFF",
...@@ -387,14 +404,14 @@ export default { ...@@ -387,14 +404,14 @@ export default {
], ],
series: [ series: [
{ {
name: "Forest", name: "社团",
type: "bar", type: "bar",
barGap: 0, barGap: 0,
label: labelOption, label: labelOption,
emphasis: { emphasis: {
focus: "series", focus: "series",
}, },
data: [320, 332, 301, 334, 390], data: this.areaUnderSoorganStatsList.foundationNumList,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#3167ff", color: "#3167ff",
...@@ -405,13 +422,13 @@ export default { ...@@ -405,13 +422,13 @@ export default {
}, },
}, },
{ {
name: "Steppe", name: "民非",
type: "bar", type: "bar",
label: labelOption, label: labelOption,
emphasis: { emphasis: {
focus: "series", focus: "series",
}, },
data: [220, 182, 191, 234, 290], data: this.areaUnderSoorganStatsList.leagueNumList,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#ff4444", color: "#ff4444",
...@@ -421,6 +438,23 @@ export default { ...@@ -421,6 +438,23 @@ export default {
}, },
}, },
}, },
{
name: "基金会",
type: "bar",
label: labelOption,
emphasis: {
focus: "series",
},
data: this.areaUnderSoorganStatsList.minFeiNumList,
itemStyle: {
normal: {
color: "#FAC858",
lineStyle: {
color: "#FAC858",
},
},
},
},
], ],
}; };
...@@ -515,7 +549,7 @@ export default { ...@@ -515,7 +549,7 @@ export default {
.numText { .numText {
font-size: 20px; font-size: 20px;
color: #3A92F1; color: #3a92f1;
text-align: center; text-align: center;
} }
......
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