From af63b044b26ddf2a381b28e7a7f413ddeb31e1e9 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期五, 29 四月 2022 12:07:30 +0800
Subject: [PATCH] 社会收支总表
---
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoShouzhiZongbiao.vue | 382 +++++++++++------------------------------------
src/pages/show/otherBusiness/OtherBusiness.vue | 4
src/router/router.js | 30 +-
src/api/shehuiBaozhang.js | 15 +
src/pages/components/showIndexTitle.vue | 1
src/pages/show/personnelTalents/PersonnelTalents.vue | 2
6 files changed, 118 insertions(+), 316 deletions(-)
diff --git a/src/api/shehuiBaozhang.js b/src/api/shehuiBaozhang.js
index 04f0229..568fac9 100644
--- a/src/api/shehuiBaozhang.js
+++ b/src/api/shehuiBaozhang.js
@@ -10,27 +10,32 @@
return postRequest('/ybg/webservice/app/social/getPersonTable.do', params)
}
-//14.鏌ヨ鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁版暟鎹帴鍙�
+//34.鏌ヨ绀句細淇濋殰鍩洪噾缁熻琛ㄦ暟鎹帴鍙�
+export const getStatisticsTable = (params) => {
+ return postRequest('/ybg/webservice/app/social/getStatisticsTable.do', params)
+}
+
+//12.鏌ヨ鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁版暟鎹帴鍙�
export const getSecurityTable = (params) => {
return postRequest('/ybg/webservice/app/social/getSecurityTable.do', params)
}
-//15.鏌ヨ杩戜竴骞磋亴宸ュ吇鑰佷繚闄╁弬淇濅汉鏁版姌绾垮浘鏁版嵁鎺ュ彛
+//13.鏌ヨ杩戜竴骞磋亴宸ュ吇鑰佷繚闄╁弬淇濅汉鏁版姌绾垮浘鏁版嵁鎺ュ彛
export const getSecurityDetailChart = (params) => {
return postRequest('/ybg/webservice/app/social/getSecurityDetailChart.do', params)
}
-//16.鏌ヨ绀句細淇濋櫓鍙備繚浜烘暟琛ㄦ牸鏁版嵁鎺ュ彛
+//14.鏌ヨ绀句細淇濋櫓鍙備繚浜烘暟琛ㄦ牸鏁版嵁鎺ュ彛
export const getInsuranceTable = (params) => {
return postRequest('/ybg/webservice/app/social/getInsuranceTable.do', params)
}
-//17.鏌ヨ绀句繚寰佺即鏀跺叆鏄庣粏鎬昏琛ㄦ牸鏁版嵁鎺ュ彛
+//15.鏌ヨ绀句繚寰佺即鏀跺叆鏄庣粏鎬昏琛ㄦ牸鏁版嵁鎺ュ彛
export const getFundincomeTable = (params) => {
return postRequest('/ybg/webservice/app/social/getFundincomeTable.do', params)
}
-//18.鏌ヨ绀句繚寰佺即鏀跺叆鍜屽弬淇濅汉鏁板钩鍧囧�艰〃鏍兼暟鎹帴鍙�
+//16.鏌ヨ绀句繚寰佺即鏀跺叆鍜屽弬淇濅汉鏁板钩鍧囧�艰〃鏍兼暟鎹帴鍙�
export const getAverageTable = (params) => {
return postRequest('/ybg/webservice/app/social/getAverageTable.do', params)
}
diff --git a/src/pages/components/showIndexTitle.vue b/src/pages/components/showIndexTitle.vue
index 3b0b3a1..91c2402 100644
--- a/src/pages/components/showIndexTitle.vue
+++ b/src/pages/components/showIndexTitle.vue
@@ -75,7 +75,6 @@
name: "showIndexTitle",
data() {
return {
- activeStyle: false,
activeIndex: '/index'
}
},
diff --git a/src/pages/show/otherBusiness/OtherBusiness.vue b/src/pages/show/otherBusiness/OtherBusiness.vue
index 1a542d4..1cfabad 100644
--- a/src/pages/show/otherBusiness/OtherBusiness.vue
+++ b/src/pages/show/otherBusiness/OtherBusiness.vue
@@ -2,12 +2,12 @@
<div class="otherBusiness-wrap">
<div class="otherB-menu-left">
<el-menu :default-active="$route.path" router mode="vertical">
- <el-menu-item index="/otherB-PeopleJunShouRu">
+ <el-menu-item index="/otherB_PeopleJunShouRu">
<div class="menu-left-block">
<h1>灞呮皯浜哄潎</h1>
</div>
</el-menu-item>
- <el-menu-item index="/otherB-GongGuTuoPin">
+ <el-menu-item index="/otherB_GongGuTuoPin">
<div class="menu-left-block">
<h1>宸╁浐鑴辫传鎴愭灉</h1>
</div>
diff --git a/src/pages/show/personnelTalents/PersonnelTalents.vue b/src/pages/show/personnelTalents/PersonnelTalents.vue
index 42c528f..086d50a 100644
--- a/src/pages/show/personnelTalents/PersonnelTalents.vue
+++ b/src/pages/show/personnelTalents/PersonnelTalents.vue
@@ -2,7 +2,7 @@
<div class="personnelTalents__warp">
<div class="personnelTalents-menu-left">
<el-menu :default-active="$route.path" router mode="vertical">
- <el-menu-item index="/personnelTalents_unitPersonnel">
+ <el-menu-item index="/personnelTalents_UnitPersonnel">
<div class="menu-left-block">
<h1 style="line-height:1.6;">浜嬩笟鍗曚綅
<br/>浜哄憳鎯呭喌</h1>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoShouzhiZongbiao.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoShouzhiZongbiao.vue
index 6b8406d..3c7584a 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoShouzhiZongbiao.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shebaoShouzhiZongbiao.vue
@@ -6,281 +6,59 @@
:cell-style="handleCellStyle"
:data="tableData"
style="width: 100%">
- <el-table-column
- align="center"
- prop="name"
- label="椤圭洰"
- fixed>
- </el-table-column>
- <el-table-column label="1鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
+ <template v-for="(item,index) in headerArry">
+ <template v-if="index == 0">
+ <el-table-column
+ align="center"
+ :prop="item.name"
+ label="椤圭洰"
+ fixed>
+ <template slot-scope="scope">
+ <span :class="[Number(item.taxesIncome) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.name}}</span>
+ </template>
+ </el-table-column>
+ </template>
+ <el-table-column :label="item.month" align="center">
+ <el-table-column
+ align="center"
+ label="鎬绘敹鍏�">
+ <template slot-scope="scope">
+ <span :class="[Number(item.totalIncome) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.totalIncome}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="寰侀泦鏀跺叆">
+ <template slot-scope="scope">
+ <span :class="[Number(item.taxesIncome) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.taxesIncome}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="鏈湀鏀嚭">
+ <template slot-scope="scope">
+ <span :class="[Number(item.pay) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.pay}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="鏈湀缁撲綑">
+ <template slot-scope="scope">
+ <span :class="[Number(item.balance) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.balance}}</span>
+ </template>
+ </el-table-column>
</el-table-column>
- <el-table-column
- align="center"
- prop="zhengjishouru"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="benyuezhichu"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="item.benyuejieyu"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="2鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="3鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="4鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="5鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="6鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="7鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="9鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="10鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="11鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="12鏈�" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鏈勾绱" align="center">
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鎬绘敹鍏�">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="寰侀泦鏀跺叆">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀鏀嚭">
- </el-table-column>
- <el-table-column
- align="center"
- prop="totalMoney"
- label="鏈湀缁撲綑">
- </el-table-column>
- </el-table-column>
- <el-table-column
- align="center"
- prop="name"
- label="绱缁撲綑">
- </el-table-column>
+ <template v-if="index == headerArry.length - 1">
+ <el-table-column
+ align="center"
+ :prop="item.surplus"
+ label="绱缁撲綑">
+ <template slot-scope="scope">
+ <span :class="[Number(item.surplus) < 0 ? 'fontColorRed' : '']" style="margin-left: 10px">{{item.surplus}}</span>
+ </template>
+ </el-table-column>
+ </template>
+ </template>
</el-table>
<div class="shebaoShouzhiZongbiaoEcharts" id="shebaoShouzhiZongbiaoEcharts"></div>
</div>
@@ -289,35 +67,49 @@
<script>
import nowSize from "../../../../libs/nowSize";
+ import {getStatisticsTable} from '@/api/shehuiBaozhang'
export default {
name: "shebaoShouzhiZongbiao",
data() {
return {
tableHead:[],
- tableData:[
- {
- name: '椤圭洰1',
- mouth: '1鏈�',
- totalMoney: '2222',
- zhengjishouru: '12333',
- benyuezhichu:'52667',
- benyuejieyu:'2332'
- },
- {
- name: '椤圭洰2',
- mouth: '1鏈�',
- totalMoney: '2222',
- zhengjishouru: '12333',
- benyuezhichu:'52667',
- benyuejieyu:'2332'
- }
- ]
+ tableData:[],
+ headerArry:[]
}
},
mounted() {
+ this.getStatisticsTable()
this.shebaoShouzhiZongbiaoEcharts()
},
methods: {
+ getStatisticsTable() {
+ getStatisticsTable().then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ this.getData()
+ }
+ })
+ },
+ getData() {
+ let row = []
+ this.tableData.forEach((e,index) => {
+ e.dataList.forEach((c,i) => {
+ if(index == 0) {
+ row.push({
+ name: e.item,
+ "month": c.month ,
+ "totalIncome": c.totalIncome,
+ "taxesIncome": c.taxesIncome,
+ "pay": c.pay,
+ "balance": c.balance,
+ "surplus": c.surplus || null
+ })
+ }
+ })
+ this.headerArry = row
+ console.log(this.headerArry)
+ })
+ },
shebaoShouzhiZongbiaoEcharts() {
let myEchart = this.$echarts.init(document.getElementById('shebaoShouzhiZongbiaoEcharts'))
let option = {
@@ -501,6 +293,12 @@
text-align: center;
line-height: 2;
}
+ .fontColorBlue {
+ color: $color-blue;
+ }
+ .fontColorRed {
+ color: #FF3939;
+ }
}
.shebaoShouzhiZongbiaoEcharts{
height: calc(100% - 640px - 0.33203125rem /* 85/256 */);
diff --git a/src/router/router.js b/src/router/router.js
index 7774c46..07e060b 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -161,21 +161,21 @@
{
path: '/personnelTalents',
meta: {title: "浜轰簨浜烘墠"},
- name: 'PersonnelTalents',
- redirect: '/personnelTalents_unitPersonnel',
+ name: 'personnelTalents',
+ redirect: '/personnelTalents_UnitPersonnel',
component: PersonnelTalents,
children:[
{
- path: "/personnelTalents_unitPersonnel",
+ path: "/personnelTalents_UnitPersonnel",
meta: {title: "浜嬩笟鍗曚綅浜哄憳鎯呭喌", routerParent: 'personnelTalents'},
- name: "/PersonnelTalents_unitPersonnel",
+ name: "/personnelTalents_unitPersonnel",
component: () =>
import(
"@/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue"
)
},
{
- path: "/personnelTalents_greenCard",
+ path: "/personnelTalents_GreenCard",
meta: {title: "浜烘墠缁垮崱琛ヨ创", routerParent: 'personnelTalents'},
name: "/PersonnelTalents_GreenCard",
component: () =>
@@ -187,7 +187,7 @@
},
{
path: '/laborRelations',
- meta: {title: "鍔冲姩鍏崇郴"},
+ meta: {title: "鍔冲姩鍏崇郴", routerParent: 'laborRelations'},
name: 'LaborRelations',
component: () => import("@/pages/show/laborRelations/LaborRelations.vue")
},
@@ -195,22 +195,22 @@
path: "/otherBusiness",
component: OtherBusiness,
meta: {title: "鍏朵粬涓氬姟"},
- redirect: "/otherB-PeopleJunShouRu",
- name: "OtherBusiness",
+ redirect: "/otherB_PeopleJunShouRu",
+ name: "otherBusiness",
children: [
{
- path: "/otherB-PeopleJunShouRu",
- meta: {title: "灞呮皯浜哄眳鏀跺叆銆佸彲鏀厤鏀跺叆", routerParent: 'OtherBusiness'},
- name: "otherB-PeopleJunShouRu",
+ path: "/otherB_PeopleJunShouRu",
+ meta: {title: "灞呮皯浜哄眳鏀跺叆銆佸彲鏀厤鏀跺叆", routerParent: 'otherBusiness'},
+ name: "otherB_PeopleJunShouRu",
component: () =>
import(
"@/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue"
)
},
{
- path: "/otherB-GongGuTuoPin",
- meta: {title: "灞呮皯浜哄眳鏀跺叆銆佸彲鏀厤鏀跺叆", routerParent: 'OtherBusiness'},
- name: "otherB-GongGuTuoPin",
+ path: "/otherB_GongGuTuoPin",
+ meta: {title: "灞呮皯浜哄眳鏀跺叆銆佸彲鏀厤鏀跺叆", routerParent: 'otherBusiness'},
+ name: "otherB_GongGuTuoPin",
component: () =>
import(
"@/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue"
@@ -220,7 +220,7 @@
},
{
path: "/businessPolicy",
- meta: {title: "钀ュ晢鏀跨瓥"},
+ meta: {title: "钀ュ晢鏀跨瓥", routerParent: 'businessPolicy'},
name: "businessPolicy",
component: () => import("@/pages/show/businessPolicy/BusinessPolicy")
}
--
Gitblit v1.9.1