From ee658b8ab1dd3b76b8c3fa3f2006b4fa8e8af0cf Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期五, 22 四月 2022 17:33:13 +0800
Subject: [PATCH] 社会保障接口对接
---
src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruTotal.vue | 115 ++++++++
src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue | 153 +++++++----
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shiyeBaoxian.vue | 2
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoZhengjiShouru.vue | 75 ++++
src/pages/show/shehuiBaozhang/shehuiBaozhang.vue | 2
src/pages/components/juminYanglaoBaoxian/baoxianForm.vue | 59 ++--
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/qiyezhigongShebao.vue | 3
src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruForm.vue | 116 ++++++++
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/gongshangBaoxian.vue | 2
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/juminYanglaoBaoxian.vue | 9
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue | 107 +++----
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/jiguanzhigongShebao.vue | 2
src/pages/components/qiyezhigongShebao/zhigongShebao.vue | 57 ++--
src/api/shehuiBaozhang.js | 36 ++
src/pages/components/qiyezhigongShebao/zhigongshebaoForm.vue | 28 +
15 files changed, 569 insertions(+), 197 deletions(-)
diff --git a/src/api/shehuiBaozhang.js b/src/api/shehuiBaozhang.js
new file mode 100644
index 0000000..664ad87
--- /dev/null
+++ b/src/api/shehuiBaozhang.js
@@ -0,0 +1,36 @@
+import {getRequest,postRequest} from "../libs/axios";
+
+//10.鏌ヨ鍘嗗勾绀句細淇濋櫓鍙備繚浜哄憳鍒嗘瀽鍥炬暟鎹帴鍙�
+export const getPersonChart = (params) => {
+ return postRequest('/ybg/webservice/app/social/getPersonChart.do', params)
+}
+
+//11.鏌ヨ绀句細淇濋櫓鍙備繚浜哄憳缁熻琛ㄦ暟鎹帴鍙�
+export const getPersonTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getPersonTable.do', params)
+}
+
+//14.鏌ヨ鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁版暟鎹帴鍙�
+export const getSecurityTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getSecurityTable.do', params)
+}
+
+//15.鏌ヨ杩戜竴骞磋亴宸ュ吇鑰佷繚闄╁弬淇濅汉鏁版姌绾垮浘鏁版嵁鎺ュ彛
+export const getSecurityDetailChart = (params) => {
+ return postRequest('/ybg/webservice/app/social/getSecurityDetailChart.do', params)
+}
+
+//16.鏌ヨ绀句細淇濋櫓鍙備繚浜烘暟琛ㄦ牸鏁版嵁鎺ュ彛
+export const getInsuranceTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getInsuranceTable.do', params)
+}
+
+//17.鏌ヨ绀句繚寰佺即鏀跺叆鏄庣粏鎬昏琛ㄦ牸鏁版嵁鎺ュ彛
+export const getFundincomeTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getFundincomeTable.do', params)
+}
+
+//18.鏌ヨ绀句繚寰佺即鏀跺叆鍜屽弬淇濅汉鏁板钩鍧囧�艰〃鏍兼暟鎹帴鍙�
+export const getAverageTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getAverageTable.do', params)
+}
diff --git a/src/pages/components/juminYanglaoBaoxian/baoxianForm.vue b/src/pages/components/juminYanglaoBaoxian/baoxianForm.vue
index cafbef3..f021db4 100644
--- a/src/pages/components/juminYanglaoBaoxian/baoxianForm.vue
+++ b/src/pages/components/juminYanglaoBaoxian/baoxianForm.vue
@@ -7,72 +7,67 @@
<el-table-column
width="200"
align="center"
- prop="name"
+ prop="areaName"
label="鍘匡紙甯傘�佸尯锛�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="january"
label="1鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
- label="1鏈�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="month"
+ prop="february"
label="2鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="march"
label="3鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="april"
label="4鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="may"
label="5鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="june"
label="6鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="july"
label="7鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="august"
label="8鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="september"
label="9鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="october"
label="10鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="november"
label="11鏈�">
</el-table-column>
<el-table-column
align="center"
- prop="month"
+ prop="december"
label="12鏈�">
</el-table-column>
</el-table>
@@ -80,28 +75,36 @@
</template>
<script>
+ import {getInsuranceTable} from '@/api/shehuiBaozhang'
export default {
name: "baoxianForm",
props: {
paddingTop: {
type: Number,
default: 0.078125
+ },
+ typeData: {
+ type: String,
+ default: '3'
}
},
computed: {
},
data() {
return {
- tableData:[{
- name: '鍏ㄥ競',
- month: '23233'
- },{
- name: '甯傛湰绾�',
- month: '23233'
- },{
- name: '闀垮畨鍖�',
- month: '23233'
- }]
+ tableData:[]
+ }
+ },
+ mounted() {
+ this.getInsuranceTable()
+ },
+ methods: {
+ getInsuranceTable() {
+ getInsuranceTable({type: this.typeData}).then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
}
}
}
diff --git a/src/pages/components/qiyezhigongShebao/zhigongShebao.vue b/src/pages/components/qiyezhigongShebao/zhigongShebao.vue
index 18312e0..a79e2fd 100644
--- a/src/pages/components/qiyezhigongShebao/zhigongShebao.vue
+++ b/src/pages/components/qiyezhigongShebao/zhigongShebao.vue
@@ -4,30 +4,39 @@
border
:data="tableData"
:header-cell-style="handleheader"
- :default-sort = "{prop: 'name', order: 'descending'}"
style="width: 100%">
<el-table-column
- prop="shiqu"
+ prop="area"
label="鍘匡紙甯傘�佸尯锛�"
align="center"
width="250">
</el-table-column>
<el-table-column
sortable
- prop="name"
- label="浼佷笟鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁�"
+ :sort-method="(a,b) => {return a.insuredNums - b.insuredNums}"
+ prop="insuredNums"
+ :label="dataType"
align="center">
</el-table-column>
<el-table-column
sortable
- prop="address"
+ :sort-method="(a,b) => {return a.inJobs - b.inJobs}"
+ prop="inJobs"
label="鍦ㄨ亴鑱屽伐"
align="center">
</el-table-column>
<el-table-column
- prop="name"
sortable
+ :sort-method="(a,b) => {return a.outJobs - b.outJobs}"
+ prop="outJobs"
label="绂婚��浼�"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ sortable
+ :sort-method="(a,b) => {return a.proportion - b.proportion}"
+ prop="proportion"
+ label="渚涘吇姣�"
align="center">
</el-table-column>
<el-table-column
@@ -44,43 +53,35 @@
</template>
<script>
+ import {getSecurityTable} from '@/api/shehuiBaozhang'
import zhigongshebaoForm from "./zhigongshebaoForm";
export default {
name: "chengzhenXinzengJiuye",
components: {
zhigongshebaoForm
},
+ props: ['type','dataType'],
data() {
return {
zhigongshebaoVisiable: false, //寮规
- tableData: [{
- shiqu:'鍏ㄥ競',
- date: '1',
- name: '1',
- address: '1'
- }, {
- shiqu:'闀垮畨鍖�',
- date: '1',
- name: '2',
- address: '2'
- }, {
- shiqu:'妗ヨタ鍖�',
- date: '3',
- name: '3',
- address: '4'
- }, {
- shiqu:'鏂板崕鍖�',
- date: '4',
- name: '4',
- address: '1 '
- }]
+ tableData: []
}
},
+ mounted() {
+ this.getSecurityTable()
+ },
methods: {
+ getSecurityTable() {
+ getSecurityTable({type: this.type}).then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
handleClick(row) {
this.zhigongshebaoVisiable = true
this.$nextTick(() => {
- this.$refs.zhigongshebaoForm.init()
+ this.$refs.zhigongshebaoForm.init(this.type,row.area)
})
},
handleheader(data) {
diff --git a/src/pages/components/qiyezhigongShebao/zhigongshebaoForm.vue b/src/pages/components/qiyezhigongShebao/zhigongshebaoForm.vue
index b3ea46a..7539944 100644
--- a/src/pages/components/qiyezhigongShebao/zhigongshebaoForm.vue
+++ b/src/pages/components/qiyezhigongShebao/zhigongshebaoForm.vue
@@ -10,6 +10,7 @@
</template>
<script>
+ import {getSecurityDetailChart} from '@/api/shehuiBaozhang'
import echarts from "echarts/lib/echarts";
import nowSize from '../../../libs/nowSize'
export default {
@@ -17,13 +18,28 @@
data() {
return {
dialogVisible: false,
+ xdata:[],
+ totalData: [],
+ inJobData: [],
+ outJobData: []
}
},
methods: {
- init() {
+ init(type,area) {
this.dialogVisible = true
this.$nextTick(() => {
- this.zhigongshebaoEcharts()
+ this.getSecurityDetailChart(type,area)
+ })
+ },
+ getSecurityDetailChart(type,area) {
+ getSecurityDetailChart({type:type,area:area}).then(res => {
+ if(res.code == 1000) {
+ this.xdata = res.obj.data
+ this.totalData = res.obj.total
+ this.inJobData = res.obj.inJob
+ this.outJobData = res.obj.outJob
+ this.zhigongshebaoEcharts()
+ }
})
},
zhigongshebaoEcharts() {
@@ -64,7 +80,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['2021/4', '2021/5', '2021/6', '2021/7', '2021/8', '2021/9', '2021/10'],
+ data: this.xdata,
axisLabel: {
show: true,
textStyle: {
@@ -108,17 +124,17 @@
name: '鎬绘暟',
type: 'line',
stack: 'Total',
- data: [370, 332, 401, 534, 490, 530, 910]
+ data: this.totalData
},
{
name: '鍦ㄨ亴鑱屽伐',
type: 'line',
- data: [220, 182, 191, 234, 290, 330, 310]
+ data: this.inJobData
},
{
name: '绂婚��浼�',
type: 'line',
- data: [150, 132, 201, 154, 190, 330, 410]
+ data: this.outJobData
}
]
};
diff --git a/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruForm.vue b/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruForm.vue
new file mode 100644
index 0000000..cec2e7f
--- /dev/null
+++ b/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruForm.vue
@@ -0,0 +1,116 @@
+<template>
+ <div class="shebaoZhengjiShouruForm-wrap">
+ <div class="danwei-box">鍗曚綅锛氫汉</div>
+ <div class="shebaoZhengjiShouruForm-table">
+ <el-table
+ border
+ style="width: 100%"
+ :data="tableData">
+ <el-table-column
+ width="200"
+ align="center"
+ prop="area"
+ label="鍘匡紙甯傘�佸尯锛�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="enterprise"
+ label="浼佷笟鍏昏�佷繚闄╁熀閲戝緛缂存敹鍏�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="resident"
+ label="鍩庝埂灞呮皯鍏昏�佷繚闄╁熀閲戝緛缂存敹鍏�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="injuryInsurance"
+ label="宸ヤ激淇濋櫓鍩洪噾寰佺即鏀跺叆">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="careerInsurance"
+ label="澶变笟淇濋櫓鍩洪噾寰佺即鏀跺叆">
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: "shebaoZhengjiShouruForm",
+ props: {
+ tableData: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ },
+ data() {
+ return {
+ tableData: []
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ @import "../../../assets/css/base";
+ .shebaoZhengjiShouruForm-wrap{
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ .el-table th.el-table__cell{
+ background-color:$color-blue;
+ }
+ .el-table .el-table__body-wrapper tr{
+ height: 0.265625rem /* 68/256 */;
+ }
+ .el-table tr:nth-child(odd){
+ background-color: #CEF2FF;
+ }
+ .el-table tr:nth-child(even){
+ background-color: #A8E9FF;
+ }
+ .el-table, .el-table__expanded-cell{
+ background-color: transparent;
+ }
+ .el-table thead{
+ color: $color-darkGrey;
+ }
+ .el-table{
+ color: $color-darkGrey;
+ }
+ .el-table .cell{
+ font-size: $fontSize-28;
+ color: $color-darkGrey;
+ font-weight: 300;
+ line-height: 1;
+ }
+ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+ border-bottom:1Px solid $color-grey; /*no*/
+ }
+ .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
+ border-right:1Px solid $color-grey; /*no*/
+ }
+ }
+</style>
+
+<style lang="scss" scoped>
+ @import "../../../assets/css/base";
+ .shebaoZhengjiShouruForm-wrap{
+ position: relative;
+ .danwei-box{
+ position: absolute;
+ right: 0;
+ top: 0;
+ color: $color-white;
+ }
+ .shebaoZhengjiShouruForm-table{
+ padding-top: 0.234375rem /* 60/256 */;
+ }
+ }
+
+</style>
diff --git a/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruTotal.vue b/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruTotal.vue
new file mode 100644
index 0000000..59dc2dd
--- /dev/null
+++ b/src/pages/components/shebaoZhengjiShouru/shebaoZhengjiShouruTotal.vue
@@ -0,0 +1,115 @@
+<template>
+ <div class="shebaoZhengjiShouruForm-wrap">
+ <div class="danwei-box">鍗曚綅锛氫汉</div>
+ <div class="shebaoZhengjiShouruForm-table">
+ <el-table
+ border
+ style="width: 100%"
+ :data="totalTableData">
+ <el-table-column
+ width="200"
+ align="center"
+ prop="area"
+ label="鍘匡紙甯傘�佸尯锛�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="enterprise"
+ label="浼佷笟鍏昏�佷繚闄╁熀閲戝緛缂存敹鍏�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="resident"
+ label="鍩庝埂灞呮皯鍏昏�佷繚闄╁熀閲戝緛缂存敹鍏�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="injuryInsurance"
+ label="宸ヤ激淇濋櫓鍩洪噾寰佺即鏀跺叆">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="careerInsurance"
+ label="澶变笟淇濋櫓鍩洪噾寰佺即鏀跺叆">
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: "shebaoZhengjiShouruTotal",
+ props: {
+ totalTableData: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ },
+ data() {
+ return {
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ @import "../../../assets/css/base";
+ .shebaoZhengjiShouruForm-wrap{
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ .el-table th.el-table__cell{
+ background-color:$color-blue;
+ }
+ .el-table .el-table__body-wrapper tr{
+ height: 0.265625rem /* 68/256 */;
+ }
+ .el-table tr:nth-child(odd){
+ background-color: #CEF2FF;
+ }
+ .el-table tr:nth-child(even){
+ background-color: #A8E9FF;
+ }
+ .el-table, .el-table__expanded-cell{
+ background-color: transparent;
+ }
+ .el-table thead{
+ color: $color-darkGrey;
+ }
+ .el-table{
+ color: $color-darkGrey;
+ }
+ .el-table .cell{
+ font-size: $fontSize-28;
+ color: $color-darkGrey;
+ font-weight: 300;
+ line-height: 1;
+ }
+ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+ border-bottom:1Px solid $color-grey; /*no*/
+ }
+ .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
+ border-right:1Px solid $color-grey; /*no*/
+ }
+ }
+</style>
+
+<style lang="scss" scoped>
+ @import "../../../assets/css/base";
+ .shebaoZhengjiShouruForm-wrap{
+ position: relative;
+ .danwei-box{
+ position: absolute;
+ right: 0;
+ top: 0;
+ color: $color-white;
+ }
+ .shebaoZhengjiShouruForm-table{
+ padding-top: 0.234375rem /* 60/256 */;
+ }
+ }
+
+</style>
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
index 2de4d00..5c5e67c 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
@@ -255,13 +255,17 @@
<el-table
:data="tableData"
:span-method="objectSpanMethod"
+ :cell-style="cellClass"
border>
<el-table-column
align="center"
- type="index">
+ type="index"
+ label="搴忓彿"
+ width="110">
</el-table-column>
<template v-for="(item,index) in heardArry">
<el-table-column
+ :key="index"
align="center"
:prop="item"
:label="item">
@@ -303,35 +307,7 @@
name: "biyeshengStatistics",
data() {
return {
- tableData: [{
- xiangmu: '鏈競楂樻牎',
- year: '2333',
- mergeRowIndex: 1,
- },{
- xiangmu: '鍏朵腑锛氭湰绉戞瘯涓氱敓',
- year: '2333',
- mergeRowIndex: 1,
- },{
- xiangmu: '涓撶姣曚笟鐢�',
- year: '2333',
- mergeRowIndex: 1,
- },{
- xiangmu: '鍏ㄧ渷楂樻牎',
- year: '2333',
- mergeRowIndex: 2,
- },{
- xiangmu: '鍏朵腑锛氭湰绉戞瘯涓氱敓',
- year: '2333',
- mergeRowIndex: 2,
- },{
- xiangmu: '涓撶姣曚笟鐢�',
- year: '2333',
- mergeRowIndex: 2,
- },{
- xiangmu: '鍏ㄧ渷楂樻牎鏈競鐢熸簮',
- year: '2333',
- mergeRowIndex: 3
- }],
+ tableData: [],
heardArry: [],
rowIndexArr: []//瀛樺偍鍚堝苟鍗曞厓鏍肩殑寮�濮嬩綅缃�
}
@@ -340,8 +316,40 @@
this.getGraduateTable()
},
methods: {
- objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-
+ objectSpanMethod({rowIndex, columnIndex}) { //鍚堝苟鍗曞厓鏍�
+ if(columnIndex == 0) {
+ if(this.rowIndexArr.includes(rowIndex)) {
+ console.log(rowIndex,'------index')
+ return {
+ rowspan: this.rowIndexArr[this.rowIndexArr.indexOf(rowIndex) + 1] - rowIndex,
+ colspan: 1,
+ }
+ }else {
+ return {
+ rowspan: 0,
+ colspan: 0
+ }
+ }
+ }
+ },
+ cellClass({ row, column, rowIndex, columnIndex }) { //淇敼鏌愪釜鍗曞厓鏍兼牱寮�
+ if(columnIndex == 1) {
+ if(this.rowIndexArr.includes(rowIndex)) {
+ return {
+ textAlign: 'left'
+ }
+ }
+ }
+ },
+ getData() {
+ let res = this.tableData
+ res.reduce((prev, cur, curIndex) => {
+ if(prev == 0 || prev != cur.mark) {
+ this.rowIndexArr.push(curIndex)
+ }
+ return cur.mark
+ },0)
+ this.rowIndexArr.push(res.length)
},
getGraduateTable() {
getGraduateTable().then(res => {
@@ -355,40 +363,48 @@
this.heardArry = []
}
result.forEach((item,index) => {
- item.typeList && item.typeList.forEach((e,i) => {
- console.log('e------------e',e.name)
- console.log(rows[0],'0000000000000000000000000')
+ head.push(item.year)
+ item.dataList.forEach((e,i) => {
if(!rows[i]) {
- console.log(rows[i],'rows[index]------rows[index]')
- console.log('e------------e----2',e.name)
- console.log('index------------index----index',index)
- rows[i] = {"椤圭洰" : e.name}
- console.log(rows[i],'rows[index]------------1')
+ rows[i] = { '椤圭洰' : e.name}
}
-
- e.dataList && e.dataList.forEach((data,k) => {
- if(index == 0 && i == 0) {
- head.push(data.year)
- console.log(head,'head-----=============head')
- }
- rows[i][data.year] = data.val
- console.log(rows[i][data.year],'rows---------333333333')
- })
+ rows[i][item.year] = e.val
+ rows[i]['mark'] = e.mark
})
+
})
this.tableData = rows
this.heardArry = head
- console.log('this.tableData----this.tableData-----',this.tableData)
+ this.getData()
}
})
- // let res = this.tableData
- // res.reduce((prev, cur, index) => {
- // console.log('prev',prev)
- // console.log('cur',cur)
- // console.log('index',index)
- // return cur.mergeRowIndex
- // },0)
- }
+
+ },
+ getMaxLength (arr) {
+ return arr.reduce((acc, item) => {
+ if (item) {
+ const calcLen = this.getTextWidth(item)
+ if (acc < calcLen) {
+ acc = calcLen
+ }
+ }
+ return acc
+ }, 0)
+ },
+ /*鍔ㄦ�佽幏鍙栬〃鏍煎搴�*/
+ getTextWidth (str) {
+ let width = 0
+ const html = document.createElement('span')
+ html.innerText = str
+ html.className = 'getTextWidth'
+ document.querySelector('body').appendChild(html)
+ width = document.querySelector('.getTextWidth').offsetWidth
+ console.log('width',width)
+ document.querySelector('.getTextWidth').remove()
+ return width
+ },
+ },
+ watch: {
}
}
</script>
@@ -429,6 +445,27 @@
font-weight: 300;
line-height: 1;
}
+ /*.el-table th {*/
+ /* padding: 0;*/
+ /* white-space: nowrap;*/
+ /* min-width: fit-content;*/
+ /*}*/
+
+ /*.el-table td {*/
+ /* padding: 1px;*/
+ /* white-space: nowrap;*/
+ /* width: fit-content;*/
+ /*}*/
+
+ /*!** 淇敼el-card榛樿paddingL:20px-鍐呰竟璺� **!*/
+ /*.el-card__body {*/
+ /* padding: 10px;*/
+ /*}*/
+
+ /*.el-table .cell {*/
+ /* white-space: nowrap;*/
+ /* width: fit-content;*/
+ /*}*/
}
</style>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
index 5c04242..79b1128 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
@@ -17,7 +17,7 @@
<h1>浼佷笟鑱屽伐绀句繚</h1>
</div>
</el-menu-item>
- <el-menu-item index="jiguanzhigongShebao">
+ <el-menu-item index="/jiguanzhigongShebao">
<div class="menu-left-block">
<h1>鏈哄叧鑱屽伐绀句繚</h1>
</div>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/gongshangBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/gongshangBaoxian.vue
index 594dc22..d03e82c 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/gongshangBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/gongshangBaoxian.vue
@@ -1,7 +1,7 @@
<template>
<div class="juminYanglaoBaoxian-wrap">
<div class="danwei-box">鍗曚綅锛氫汉</div>
- <baoxianForm :paddingTop="0.234375"></baoxianForm>
+ <baoxianForm :paddingTop="0.234375" typeData="5"></baoxianForm>
</div>
</template>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/jiguanzhigongShebao.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/jiguanzhigongShebao.vue
index 344634d..09d3b49 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/jiguanzhigongShebao.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/jiguanzhigongShebao.vue
@@ -1,7 +1,7 @@
<template>
<div class="jiguanzhigongShebao-wrap">
<div class="danwei-box">鍗曚綅锛氫汉</div>
- <zhigongShebao></zhigongShebao>
+ <zhigongShebao :type="2" :dataType="'鏈哄叧浜嬩笟鑱屽伐鍏昏�佷繚闄�'"></zhigongShebao>
</div>
</template>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/juminYanglaoBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/juminYanglaoBaoxian.vue
index a41d8eb..c3d888c 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/juminYanglaoBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/juminYanglaoBaoxian.vue
@@ -1,11 +1,12 @@
<template>
<div class="juminYanglaoBaoxian-wrap">
<div class="danwei-box">鍗曚綅锛氫汉</div>
- <baoxianForm :paddingTop="0.234375"></baoxianForm>
+ <baoxianForm :paddingTop="0.234375" typeData="3"></baoxianForm>
</div>
</template>
<script>
+
import baoxianForm from "../../../components/juminYanglaoBaoxian/baoxianForm";
export default {
name: "juminYanglaoBaoxian",
@@ -16,6 +17,12 @@
return {
}
+ },
+ mounted() {
+
+ },
+ methods: {
+
}
}
</script>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/qiyezhigongShebao.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/qiyezhigongShebao.vue
index b0cacef..bd3a45c 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/qiyezhigongShebao.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/qiyezhigongShebao.vue
@@ -1,7 +1,7 @@
<template>
<div class="qiyezhigongShebao-wrap">
<div class="danwei-box">鍗曚綅锛氫汉</div>
- <zhigongShebao></zhigongShebao>
+ <zhigongShebao :type="1" :dataType="'浼佷笟鑱屽伐鍏昏�佷繚闄�'"></zhigongShebao>
</div>
</template>
@@ -14,7 +14,6 @@
},
data() {
return {
-
}
}
}
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoZhengjiShouru.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoZhengjiShouru.vue
index 6b53974..ee58371 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoZhengjiShouru.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoZhengjiShouru.vue
@@ -1,33 +1,84 @@
<template>
<div class="shebaoZhengjiShouru-wrap">
<h1>鍚勫幙锛堝競銆佸尯锛�2021骞村氨涓氭儏鍐电粺璁¤〃</h1>
- <el-tabs v-model="activeName">
- <el-tab-pane label="鍩庨晣鏂板灏变笟" name="first">
- <baoxianForm></baoxianForm>
+ <el-tabs v-model="activeName" @tab-click="tabHandleClick">
+<!-- <el-tab-pane-->
+<!-- v-for="item in tabMenuList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.name"-->
+<!-- :name="item.id + ''">-->
+<!-- <shebaoZhengjiShouruForm :tableData="tableData"></shebaoZhengjiShouruForm>-->
+<!-- </el-tab-pane>-->
+ <el-tab-pane label="鎬昏" name="1">
+ <shebaoZhengjiShouruTotal :totalTableData="totalTableData"></shebaoZhengjiShouruTotal>
</el-tab-pane>
- <el-tab-pane label="澶变笟鍐嶅氨涓�" name="second">
- <baoxianForm></baoxianForm>
+ <el-tab-pane label="澶变笟鍐嶅氨涓�" name="2">
+ <shebaoZhengjiShouruForm :tableData="tableData"></shebaoZhengjiShouruForm>
</el-tab-pane>
- <el-tab-pane label="灏变笟鍥伴毦浜哄憳鍐嶅氨涓�" name="third">
- <baoxianForm></baoxianForm>
+ <el-tab-pane label="灏变笟鍥伴毦浜哄憳鍐嶅氨涓�" name="3">
+ <shebaoZhengjiShouruForm :tableData="tableData"></shebaoZhengjiShouruForm>
</el-tab-pane>
- <el-tab-pane label="鐧昏澶变笟鐜�" name="fourth">
- <baoxianForm></baoxianForm>
+ <el-tab-pane label="鐧昏澶变笟鐜�" name="4">
+ <shebaoZhengjiShouruForm :tableData="tableData"></shebaoZhengjiShouruForm>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
- import baoxianForm from "../../../components/juminYanglaoBaoxian/baoxianForm";
+ import {getFundincomeTable, getAverageTable} from '@/api/shehuiBaozhang'
+ import shebaoZhengjiShouruTotal from "../../../components/shebaoZhengjiShouru/shebaoZhengjiShouruTotal";
+ import shebaoZhengjiShouruForm from "../../../components/shebaoZhengjiShouru/shebaoZhengjiShouruForm";
export default {
name: "jiuyeQingkuang",
components: {
- baoxianForm,
+ shebaoZhengjiShouruTotal,
+ shebaoZhengjiShouruForm
},
data() {
return {
- activeName: 'first'
+ totalTableData: [],
+ tableData: [],
+ activeName: '1',
+ tabMenuList: [{
+ name: '鎬昏',
+ id: 1
+ },{
+ name: '浼佷笟鑱屽伐鍏昏�佷繚闄�',
+ id: 2
+ },{
+ name: '鍩庝埂灞呮皯鍏昏�佷繚闄�',
+ id: 3
+ },{
+ name: '宸ヤ激淇濋櫓',
+ id: 4
+ },{
+ name: '澶变笟淇濋櫓',
+ id: 5
+ }]
+ }
+ },
+ mounted() {
+ this.getFundincomeTable()
+ this.getAverageTable()
+ },
+ methods: {
+ getFundincomeTable() {
+ getFundincomeTable().then(res => {
+ if(res.code == 1000) {
+ this.totalTableData = res.list
+ }
+ })
+ },
+ getAverageTable() {
+ getAverageTable().then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ tabHandleClick(tab) {
+
}
}
}
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
index 012f262..30e2521 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
@@ -2,7 +2,7 @@
<div class="shehuiBaoxian-wrap">
<div class="shehuiBaoxian-table">
<h1>绀句細淇濋櫓鍙備繚浜哄憳缁熻琛�</h1>
- <div class="danwei-box">鍗曚綅:浜�</div>
+ <div class="danwei-box">鍗曚綅:涓囦汉</div>
<el-table
max-height="640"
:data="tableData"
@@ -12,87 +12,76 @@
style="width: 100%">
<el-table-column
align="center"
- prop="date"
+ prop="dataName"
label="鎸囨爣鍚嶇О"
fixed="left"
width="220">
</el-table-column>
<el-table-column
- prop="name"
+ prop="yearFinish"
align="center"
label="鍘诲勾瀹屾垚"
width="180">
</el-table-column>
<el-table-column
- prop="address"
+ prop="january"
align="center"
label="1鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="february"
align="center"
label="2鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="march"
align="center"
label="3鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="april"
align="center"
label="4鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="may"
align="center"
label="5鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="june"
align="center"
label="6鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="july"
align="center"
label="7鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="august"
align="center"
label="8鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="september"
align="center"
label="9鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="october"
align="center"
label="10鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="november"
align="center"
label="11鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="december"
align="center"
label="12鏈�">
- </el-table-column>
- <el-table-column
- prop="address"
- align="center"
- label="鐪佸巺璁″垝">
- </el-table-column>
- <el-table-column
- prop="address"
- align="center"
- label="褰撳墠瀹屾垚鐜�"
- width="160">
</el-table-column>
</el-table>
<div class="shehuiBaoxianEcharts" id="shehuiBaoxianEcharts"></div>
@@ -101,42 +90,43 @@
</template>
<script>
+ import {getPersonChart, getPersonTable} from '@/api/shehuiBaozhang'
import nowSize from "../../../../libs/nowSize";
export default {
name: "shehuiBaoxian",
data() {
return {
- tableData: [{
- date: '鍩庨晣鏂板灏变笟浜烘暟',
- name: '122',
- address: '32111'
- }, {
- date: '鍩庨晣澶变笟浜哄憳瀹炵幇鍐嶅氨涓氫汉鏁�',
- name: '233',
- address: '34222'
- }, {
- date: '鍐滄潙鍔冲姩鍔涘悜闈炲啘浜т笟杞Щ浜烘暟',
- name: '23222',
- address: '3112222'
- }, {
- date: '鍏朵腑锛氬姵鍔¤緭鍑�',
- name: '34221',
- address: '122222'
- }, {
- date: '寮�灞曡ˉ璐存�ц亴涓氭妧鑳藉煿璁汉鏁�',
- name: '2333',
- address: '1232233'
- }, {
- date: '鍩庨晣鐧昏澶变笟鐜�',
- name: '222',
- address: '2222'
- }]
+ tableData: [],
+ yearsData: [], //x杞存暟鎹�
+ zhigongData: [], //鍩庨晣鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁�
+ juminData: [], //鍩庝埂灞呮皯鍏昏�佷繚闄╁弬淇濅汉鏁�
+ gongshangData: [], //宸ヤ激淇濋櫓鍙備繚浜烘暟
+ shiyeData: [], //澶变笟淇濋櫓鍙備繚浜烘暟
}
},
mounted() {
- this.shehuiBaoxianEcharts()
+ this.getPersonTable()
+ this.getPersonChart()
},
methods: {
+ getPersonTable(){
+ getPersonTable().then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ getPersonChart() {
+ getPersonChart().then(res => {
+ if(res.code == 1000) {
+ this.yearsData = res.obj.years
+ this.zhigongData = res.obj.zhigong
+ this.juminData = res.obj.jumin
+ this.shiyeData = res.obj.shiye
+ this.shehuiBaoxianEcharts()
+ }
+ })
+ },
handleheader(data) {
return {
lineHeight: '0',
@@ -180,12 +170,13 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['2021/4', '2021/5', '2021/6', '2021/7', '2021/8', '2021/9', '2021/10'],
+ data: this.yearsData,
axisLabel: {
show: true,
textStyle: {
color: "#fff",
- fontSize:nowSize(24)
+ fontSize:nowSize(24),
+ lineHeight: nowSize(56),
}
},
axisLine: {
@@ -223,22 +214,22 @@
{
name: '鍩庝埂灞呮皯鍏昏�佷繚闄╁弬淇濅汉鏁�',
type: 'line',
- data: [370, 332, 401, 534, 490, 530, 910]
+ data: this.juminData
},
{
name: '鍩庨晣鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁�',
type: 'line',
- data: [220, 182, 191, 234, 290, 330, 310]
+ data: this.zhigongData
},
{
name: '宸ヤ激淇濋櫓鍙備繚浜烘暟',
type: 'line',
- data: [150, 132, 201, 154, 190, 330, 410]
+ data: this.gongshangData
},
{
name: '澶变笟淇濋櫓鍙備繚浜烘暟',
type: 'line',
- data: [250, 135, 261, 154, 170, 310, 460]
+ data: this.shiyeData
}
]
};
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shiyeBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shiyeBaoxian.vue
index 283c431..9c481f0 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shiyeBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shiyeBaoxian.vue
@@ -1,7 +1,7 @@
<template>
<div class="shiyeBaoxian-wrap">
<div class="danwei-box">鍗曚綅锛氫汉</div>
- <baoxianForm :paddingTop="0.234375"></baoxianForm>
+ <baoxianForm :paddingTop="0.234375" typeData="4"></baoxianForm>
</div>
</template>
--
Gitblit v1.9.1