From 76e28b7140b15261f1d82c2855eb09b49e5902b3 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期四, 28 四月 2022 15:03:18 +0800
Subject: [PATCH] 巩固脱贫成果
---
src/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue | 100 ++++++++++++++++++++++++++------------------------
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue | 2
src/api/otherBusiness.js | 4 ++
3 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/src/api/otherBusiness.js b/src/api/otherBusiness.js
index 49419a2..49a3652 100644
--- a/src/api/otherBusiness.js
+++ b/src/api/otherBusiness.js
@@ -8,3 +8,7 @@
export const getIncomeLine = (params) => {
return postRequest('/ybg/webservice/app/asset/getIncomeLine.do',params)
}
+//33.鏌ヨ灞呮皯浜哄潎鍙敮閰嶆敹鍏ヨ〃鏍兼暟鎹帴鍙�
+export const getAchievementTable = (params) => {
+ return postRequest('/ybg/webservice/app/asset/getAchievementTable.do',params)
+}
diff --git a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue
index b9d6e2a..9107a3f 100644
--- a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue
+++ b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_GongGuTuoPin.vue
@@ -10,20 +10,20 @@
<el-table-column
label="鍏ㄥ競鑴辫传鍔冲姩鍔涘氨涓�">
<el-table-column
- prop="shengdingrenwu1"
+ prop="planTask"
label="鐪佸畾浠诲姟 锛堜竾浜猴級"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="shijiwancheng1"
+ prop="realFinish"
label="瀹為檯瀹屾垚 锛堜竾锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="shijiwanchenglv1"
+ prop="finishRate"
label="瀹為檯瀹屾垚鐜�"
min-width="80"
@@ -32,21 +32,21 @@
</el-table-column>
<el-table-column label="鏄撳湴鎵惰传鎼縼鑴辫传浜哄彛灏变笟">
<el-table-column
- prop="shengdingrenwu1"
+ prop="otherPlan"
label="鐪佸畾浠诲姟 锛堜竾浜猴級"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="shijiwancheng1"
+ prop="otherFinish"
label="瀹為檯瀹屾垚 锛堜竾锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="shijiwanchenglv1"
+ prop="otherRate"
label="瀹為檯瀹屾垚鐜�"
min-width="80"
@@ -55,21 +55,21 @@
</el-table-column>
<el-table-column label="灏变笟甯壎杞﹂棿">
<el-table-column
- prop="rendingshuliang"
+ prop="realNums"
label="璁ゅ畾鏁伴噺 锛堝锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="xinatuopin"
+ prop="drawNums"
label="鍚哥撼鑴辫传鍔冲姩鍔� 锛堜汉锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="yichixiangxina"
+ prop="subsidy"
label="涓�娆℃�у惛绾冲氨涓氳ˉ璐村彂鏀� 锛堜竾鍏冿級"
min-width="80"
@@ -78,21 +78,21 @@
</el-table-column>
<el-table-column label="杩斾埂鍏ヤ埂鍒涗笟">
<el-table-column
- prop="jianchengchuangye"
+ prop="baseNums"
label="寤烘垚鍒涗笟 瀛靛寲鍩哄湴 锛堝锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="ruzhu"
+ prop="settled"
label="鍏ラ┗ 锛堟埛锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="daidongjiuye"
+ prop="addJob"
label="甯﹀姩灏变笟 锛堜汉锛�"
min-width="80"
@@ -101,14 +101,14 @@
</el-table-column>
<el-table-column label="鍦板潃">
<el-table-column
- prop="kaifagongyi"
+ prop="station"
label="寮�鍙戝叕鐩婂矖浣� 锛堢被锛�"
min-width="80"
>
</el-table-column>
<el-table-column
- prop="anzhirenyuan"
+ prop="placeNums"
label="瀹夌疆浜哄憳 锛堜竾浜猴級"
min-width="80"
@@ -125,41 +125,41 @@
<el-table-column
label="浠ｇ即鍩庝埂灞呮皯鍏昏�佷繚闄╄垂">
<el-table-column
- prop="renshu"
+ prop="residents"
label="浜烘暟 锛堜竾浜猴級"
>
</el-table-column>
<el-table-column
- prop="money"
- label="1597 锛堜竾鍏冿級"
+ prop="amount"
+ label="閲戦 锛堜竾鍏冿級"
>
</el-table-column>
</el-table-column>
<el-table-column
label="60鍛ㄥ瞾浠ヤ笂鐨勯鍙栧緟閬�">
<el-table-column
- prop="renshu1"
+ prop="oldNums"
label="浜烘暟 锛堜竾浜猴級"
>
</el-table-column>
<el-table-column
- prop="lingqulv"
+ prop="receiveRate"
label="棰嗗彇鐜� 锛堜竾锛�"
>
</el-table-column>
<el-table-column
- prop="fafangxu"
+ prop="grantRate"
label="鍙戞斁鐜�"
>
</el-table-column>
</el-table-column>
<el-table-column
- prop="kunnanrenyuanCanbao"
+ prop="insuredRate"
label="鍥伴毦浜哄憳鍙備繚鐜�"
>
</el-table-column>
<el-table-column
- prop="kunnanrenyuanDaijiao"
+ prop="behalfRate"
label="鍥伴毦浜哄憳浠ｇ即鐜�"
>
</el-table-column>
@@ -171,36 +171,40 @@
<el-table-column
label="涔￠晣浜嬩笟鍗曚綅宸ヤ綔浜哄憳鎷涜仒">
<el-table-column
- prop="zhaopinNum"
+ prop="unitRecruit"
label="鎷涜仒浜烘暟 锛堜汉锛�"
>
</el-table-column>
<el-table-column
- prop="sixtyfupinrenwu"
+ prop="supportPoor"
label="16涓壎璐换鍔″幙 锛堜汉锛�"
>
</el-table-column>
<el-table-column
- prop="four"
+ prop="helpCounty"
label="鍏朵腑4涓噸鐐瑰府鎵跺幙 锛堜汉锛�"
>
</el-table-column>
</el-table-column>
- <el-table-column label="宸叉寕鐗岃繍琛岀殑涓撳鏈嶅姟 鍩哄眰绀鸿寖鍩哄湴 锛堜釜锛�" prop="yiguapai"></el-table-column>
+ <el-table-column
+ label="宸叉寕鐗岃繍琛岀殑涓撳鏈嶅姟
+ 鍩哄眰绀鸿寖鍩哄湴 锛堜釜锛�"
+ prop="demoBase">
+ </el-table-column>
<el-table-column
label="鈥滀笁鏀竴鎵垛�濇嫑鍕熸儏鍐�">
<el-table-column
- prop="zhaomuzhongshu"
+ prop="recruitNums"
label="鎷涘嫙鎬绘暟 锛堜汉锛�"
>
</el-table-column>
<el-table-column
- prop="sixty1"
+ prop="threePoor"
label="16涓壎璐换鍔″幙 锛堜汉锛�"
>
</el-table-column>
<el-table-column
- prop="four1"
+ prop="threeCounty"
label="鍏朵腑4涓噸鐐瑰府鎵跺幙 锛堜汉锛�"
>
</el-table-column>
@@ -211,28 +215,12 @@
</template>
<script>
+ import {getAchievementTable} from '@/api/otherBusiness'
export default {
name: "OtherB_GongGuTuoPin",
data() {
return {
- table_jiuye: [
- {
- shengdingrenwu: '7.27',
- shijiwancheng: '8.13',
- shijiwanchenglv: '108.9%',
- shengdingrenwu1: '700',
- shijiwancheng1: '861',
- shijiwanchenglv1: '123%',
- rendingshuliang: 22,
- xinatuopin: 279,
- yichixiangxina: 14.9,
- jianchengchuangye: 38,
- ruzhu: 2922,
- daidongjiuye: 5589,
- kaifagongyi: 7,
- anzhirenyuan: 1.4
- }
- ],
+ table_jiuye: [],
table_shebao: [
{
renshu: '15.97',
@@ -257,7 +245,23 @@
]
}
},
- methods: {}
+ mounted() {
+ this.getAchievementTable()
+ },
+ methods: {
+ getAchievementTable() {
+ getAchievementTable().then(res => {
+ this.table_jiuye = []
+ this.table_shebao = []
+ this.table_rencai = []
+ if(res.code == 1000) {
+ this.table_jiuye.push(res.obj.jiuye)
+ this.table_shebao.push(res.obj.shebao)
+ this.table_rencai.push(res.obj.rencai)
+ }
+ })
+ }
+ }
}
</script>
<style lang="scss">
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
index f81b457..e231a57 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
@@ -112,7 +112,7 @@
rowspan() {
let position = 0 //鐢ㄤ簬瀛樺偍鐩稿悓椤圭殑寮�濮媔ndex
this.tableData.forEach((item,index) => {
- console.log('item--',item)
+ console.log(item,'------------', + index)
if(index === 0) {
this.spanArr.push(1)
}else {
--
Gitblit v1.9.1