From 1f81ea3da2aa638453f71f13cd1c42ef6b27a2d3 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期日, 24 四月 2022 08:18:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue | 107 ++++++++++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 58 deletions(-)
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
}
]
};
--
Gitblit v1.9.1