From b262be766fd1dbcb936d9dda5b5e802de4d27e59 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 28 四月 2022 11:24:40 +0800
Subject: [PATCH] 其他业务
---
src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue | 203 ++++++++++++++++++++++++--------------------------
src/api/otherBusiness.js | 10 ++
2 files changed, 109 insertions(+), 104 deletions(-)
diff --git a/src/api/otherBusiness.js b/src/api/otherBusiness.js
new file mode 100644
index 0000000..49419a2
--- /dev/null
+++ b/src/api/otherBusiness.js
@@ -0,0 +1,10 @@
+import { getRequest, postRequest} from "../libs/axios";
+
+// 31. 鏌ヨ灞呮皯浜哄潎鍙敮閰嶆敹鍏ヨ〃鏍兼暟鎹帴鍙�
+export const getIncomeTable = (params) => {
+ return postRequest('/ybg/webservice/app/asset/getIncomeTable.do',params)
+}
+// 32. 鏌ヨ灞呮皯鍙敮閰嶆敹鍏ュ垎鏋愬浘鏁版嵁鎺ュ彛
+export const getIncomeLine = (params) => {
+ return postRequest('/ybg/webservice/app/asset/getIncomeLine.do',params)
+}
diff --git a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
index e25f860..597b6d1 100644
--- a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
+++ b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
@@ -6,7 +6,7 @@
:data="tableData"
style="width: 100%" :cell-style="updataCellStyle">
<el-table-column
- prop="year"
+ prop="jyear"
label="骞翠唤" min-width="80"
fied="left"
>
@@ -14,27 +14,27 @@
<el-table-column
label="鍥芥皯浜哄潎鍙敮閰嶆敹鍏�">
<el-table-column
- prop="shouru"
+ prop="jincome"
label="鏀跺叆(鍏�)"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quanshengpaiwei"
+ prop="jprovinceRank"
label="鍏ㄧ渷鎺掑悕"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="zengzhang"
+ prop="jincrease"
label="澧為暱"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quanshengpaiwei1"
+ prop="jincreaseRank"
label="鍏ㄧ渷鎺掍綅"
min-width="80"
@@ -43,28 +43,28 @@
</el-table-column>
<el-table-column label="鍩庨晣灞呮皯浜哄潎鍙敮閰嶆敹鍏�">
<el-table-column
- prop="shouru1"
+ prop="cincome"
label="鏀跺叆(鍏�)"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quanshengpaiwei2"
+ prop="cprovinceRank"
label="鍏ㄧ渷鎺掍綅"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="zengzhang1"
+ prop="cincrease"
label="澧為暱"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quanshengpaiwei3"
+ prop="cincreaseRank"
label="鍏ㄧ渷鎺掍綅"
min-width="80"
@@ -73,27 +73,27 @@
</el-table-column>
<el-table-column label="鍐滄潙灞呮皯浜哄潎鍙敮閰嶆敹鍏�">
<el-table-column
- prop="shouru2"
+ prop="nincome"
label="鏀跺叆(鍏�)"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quashengpaiwei4"
+ prop="nprovinceRank"
label="鍏ㄧ渷鎺掍綅"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="zengzhang2"
+ prop="nincrease"
label="澧為暱 "
min-width="80"
>
</el-table-column>
<el-table-column
- prop="quanshengpaiwei5"
+ prop="nincreaseRank"
label="鍏ㄧ渷鎺掍綅"
min-width="80"
>
@@ -101,50 +101,81 @@
</el-table-column>
</el-table>
</div>
+ <!--鍥捐〃-->
<div class="OtherB-PeopleJunShouRu__echart">
-
</div>
</div>
</template>
<script>
import nowSize from '../../../../libs/nowSize'
+import {getIncomeTable, getIncomeLine} from '@/api/otherBusiness'
export default {
name: "OtherB_PerpleJunShouRu",
data() {
return {
- tableData: [{
- year: 2020,
- shouru: 30955,
- quanshengpaiwei: 3,
- zengzhang: '5.5%',
- quanshengpaiwei1: 9,
- shouru1: 40243,
- quanshengpaiwei2: 3,
- zengzhang1: '4.4%',
- quanshengpaiwei3: 6,
- shouru2: 40243,
- quashengpaiwei4: 3,
- zengzhang2: '4.4%',
- quanshengpaiwei5: 6
- },
- {
- year: 2020,
- shouru: 30955,
- quanshengpaiwei: 3,
- zengzhang: '5.5%',
- quanshengpaiwei1: 9,
- shouru1: 40243,
- quanshengpaiwei2: 3,
- zengzhang1: '4.4%',
- quanshengpaiwei3: 6,
- shouru2: 40243,
- quashengpaiwei4: 3,
- zengzhang2: '4.4%',
- quanshengpaiwei5: 6
- }],
- option: {
+ tableData: [
+ // {
+ // year: 2020,
+ // shouru: 30955,
+ // quanshengpaiwei: 3,
+ // zengzhang: '5.5%',
+ // quanshengpaiwei1: 9,
+ // shouru1: 40243,
+ // quanshengpaiwei2: 3,
+ // zengzhang1: '4.4%',
+ // quanshengpaiwei3: 6,
+ // shouru2: 40243,
+ // quashengpaiwei4: 3,
+ // zengzhang2: '4.4%',
+ // quanshengpaiwei5: 6
+ // },
+ // {
+ // year: 2020,
+ // shouru: 30955,
+ // quanshengpaiwei: 3,
+ // zengzhang: '5.5%',
+ // quanshengpaiwei1: 9,
+ // shouru1: 40243,
+ // quanshengpaiwei2: 3,
+ // zengzhang1: '4.4%',
+ // quanshengpaiwei3: 6,
+ // shouru2: 40243,
+ // quashengpaiwei4: 3,
+ // zengzhang2: '4.4%',
+ // quanshengpaiwei5: 6
+ // }
+ ],
+ echartsSeries: {}
+ }
+ },
+ mounted() {
+ this.Init_echarts()
+ this.getIncomeTable()
+ this.getIncomeLine()
+ },
+ methods: {
+ // 31. 鏌ヨ灞呮皯浜哄潎鍙敮閰嶆敹鍏ヨ〃鏍兼暟鎹帴鍙�
+ getIncomeTable() {
+ getIncomeTable().then(res => {
+ if (res.code === 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ // 32. 鏌ヨ灞呮皯鍙敮閰嶆敹鍏ュ垎鏋愬浘鏁版嵁鎺ュ彛
+ getIncomeLine() {
+ getIncomeLine().then(res => {
+ console.log(res);
+ if(res.code===1000){
+ this.echartsSeries = res.obj
+ this.Init_echarts()
+ }
+ })
+ },
+ Init_echarts() {
+ const option = {
color: ['#FF5151', '#51FF5D', '#FFD151'],
title: {
text: '鍘嗗勾鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ュ垎鏋愬浘',
@@ -185,7 +216,7 @@
nameGap: nowSize(92),// 鍧愭爣杞村悕绉颁笌杞寸嚎涔嬮棿鐨勮窛绂汇��
type: 'category',
boundaryGap: false,// 鍧愭爣杞翠袱绔暀鐧�
- data: ['2017骞�', '2018骞�', '2019骞�', '2020骞�', '2021骞�'],
+ data: this.echartsSeries.years,
axisLabel: {
show: true,
textStyle: {
@@ -234,79 +265,43 @@
{
name: '灞呮皯浜哄潎鍙敮閰嶆敹鍏�',
type: 'line',
- smooth: false, //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
- // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
- itemStyle: {
- normal: {
- lineStyle: {
- width: 3, //鎶樼嚎瀹藉害
- }
- }
- },
- emphasis: { //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
- borderColor: 'rgba(0,196,132,0.2)',
- borderWidth: 100
- },
- stack: 'Total',
- data: [120, 132, 101, 134, 90, 230]
+ data: this.echartsSeries.jumin
},
{
name: '鍩庨晣灞呮皯',
type: 'line',
- smooth: false, //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
- // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
- itemStyle: {
- normal: {
- lineStyle: {
- width: 3, //鎶樼嚎瀹藉害
- }
- }
- },
- emphasis: { //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
- borderColor: 'rgba(0,196,132,0.2)',
- borderWidth: 100
- },
- stack: 'Total',
- data: [220, 182, 191, 234, 290, 330]
+ data: this.echartsSeries.chengzhen
},
+ // smooth: false, //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
+ // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
+ // itemStyle: {
+ // normal: {
+ // lineStyle: {
+ // width: 3, //鎶樼嚎瀹藉害
+ // }
+ // }
+ // },
+ // emphasis: { //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
+ // borderColor: 'rgba(0,196,132,0.2)',
+ // borderWidth: 100
+ // },
+ // stack: 'Total',
{
name: '鍐滄潙灞呮皯',
type: 'line',
- smooth: false, //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
- // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
- itemStyle: {
- normal: {
- lineStyle: {
- width: 3, //鎶樼嚎瀹藉害
- }
- }
- },
- emphasis: { //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
- borderColor: 'rgba(0,196,132,0.2)',
- borderWidth: 100
- },
- stack: 'Total',
- data: [150, 232, 201, 154, 190, 330]
+ data: this.echartsSeries.nongcun
}
]
}
- }
- },
- mounted() {
- this.Init_echarts()
- },
- methods: {
- Init_echarts() {
- const option = this.option
const myChart = this.$echarts.init(document.querySelector('.OtherB-PeopleJunShouRu__echart'));
- option && myChart.setOption(this.option)
+ option && myChart.setOption(option)
},
// 缁欏崟鐙崟鍏冩牸娣诲姞鏍峰紡
updataCellStyle({rowIndex, columnIndex}) {
- if (rowIndex ===0 && columnIndex === 0) {
- return {background:'#51D2FF'}
- }else if(rowIndex===1 && columnIndex ===0){
- return {background:'#51D2FF'}
+ if (rowIndex === 0 && columnIndex === 0) {
+ return {background: '#51D2FF'}
+ } else if (rowIndex === 1 && columnIndex === 0) {
+ return {background: '#51D2FF'}
}
}
}
--
Gitblit v1.9.1