From 9efb4e77cf44f0adaf677662c6779b45954a0a2b Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期五, 22 四月 2022 16:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue | 219 ++++++++++++++++++---
src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue | 177 +++++++++++++++++
src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue | 59 ++++-
src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue | 2
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 88 +++-----
src/api/jiuyeAndChuangye.js | 20 ++
6 files changed, 459 insertions(+), 106 deletions(-)
diff --git a/src/api/jiuyeAndChuangye.js b/src/api/jiuyeAndChuangye.js
index 8586563..4b69040 100644
--- a/src/api/jiuyeAndChuangye.js
+++ b/src/api/jiuyeAndChuangye.js
@@ -19,3 +19,23 @@
export const getParkTable = (params) => {
return postRequest('/ybg/webservice/app/employment/getParkTable.do',params)
}
+
+//6.鏌ヨ灏变笟鎯呭喌缁熻琛ㄦ暟鎹帴鍙�
+export const getEmployTable = (params) => {
+ return postRequest('/ybg/webservice/app/employment/getEmployTable.do', params)
+}
+
+//7.姣曚笟鐢熺粺璁¤〃鏍兼暟鎹帴鍙�
+export const getGraduateTable = (params) => {
+ return postRequest('/ybg/webservice/app/employment/getGraduateTable.do', params)
+}
+
+// 8.鏌ヨ鑱屼笟鍩硅缁熻琛ㄦ牸鏁版嵁鎺ュ彛
+export const getTrainTable = (params) => {
+ return postRequest('/ybg/webservice/app/employment/getTrainTable.do', params)
+}
+
+//9.鏌ヨ鑱屼笟鍩硅缁熻鍥捐〃鏁版嵁鎺ュ彛
+export const getTrainChart = (params) => {
+ return postRequest('/ybg/webservice/app/employment/getTrainChart.do', params)
+}
diff --git a/src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue b/src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue
index 14145db..69634c8 100644
--- a/src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue
+++ b/src/pages/components/jiuyeQingkuang/chengzhenXinzengJiuye.vue
@@ -6,102 +6,210 @@
:header-cell-style="handleheader"
style="width: 100%">
<el-table-column
- prop="shiqu"
+ prop="area"
label="鍘匡紙甯傘�佸尯锛�"
align="center"
width="220">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <div class="cell-content-box">{{scope.row.area}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="january"
label="1鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <div class="cell-content-box">{{scope.row.january.val}}</div>
+ <div class="paiming-box red-sanjiao"
+ :class="scope.row.january.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.january.order != 0">
+ <div>{{scope.row.january.order}}</div>
+ </div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="february"
label="2鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <div>{{scope.row.february.val}}</div>
+ <div class="paiming-box"
+ :class="scope.row.february.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.february.order != 0">
+ <div>{{scope.row.february.order}}</div>
+ </div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="march"
label="3鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <div>{{scope.row.march.val}}</div>
+ <div class="paiming-box"
+ :class="scope.row.march.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.march.order != 0">{{scope.row.march.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="april"
label="4鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.april.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.april.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.april.order != 0">{{scope.row.april.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="may"
label="5鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.may.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.may.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.may.order != 0">{{scope.row.may.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="june"
label="6鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.june.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.june.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.june.order != 0">{{scope.row.june.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="july"
label="7鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.july.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.july.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.july.order != 0">{{scope.row.july.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="august"
label="8鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.august.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.august.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.august.order != 0">{{scope.row.august.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="september"
label="9鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.september.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.september.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.september.order != 0">{{scope.row.september.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="october"
label="10鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.october.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.october.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.october.order != 0">{{scope.row.october.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="name"
+ width="280"
+ prop="november"
label="11鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.november.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.november.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.november.order != 0">{{scope.row.november.order}}</div>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ width="280"
+ prop="december"
label="12鏈�"
align="center">
+ <template slot-scope="scope">
+ <div class="sanjiao-box">
+ <span>{{scope.row.december.val}}</span>
+ <div class="paiming-box"
+ :class="scope.row.december.order > 0 ? 'red-sanjiao' : 'green-sanjiao'"
+ v-if="scope.row.december.order != 0">{{scope.row.december.order}}</div>
+ </div>
+ </template>
</el-table-column>
</el-table>
</div>
</template>
<script>
+
export default {
name: "chengzhenXinzengJiuye",
+ props: {
+ tableData: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ },
data() {
return {
- tableData: [{
- shiqu:'鍏ㄥ競',
- date: '233322',
- name: '4432',
- address: '122'
- }, {
- shiqu:'闀垮畨鍖�',
- date: '23322',
- name: '12222',
- address: '4445'
- }, {
- shiqu:'妗ヨタ鍖�',
- date: '4432',
- name: '455',
- address: '5999'
- }, {
- shiqu:'鏂板崕鍖�',
- date: '5632',
- name: '145',
- address: '624'
- }]
+
}
+ },
+ mounted() {
},
methods: {
handleheader(data) {
@@ -122,7 +230,6 @@
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;
@@ -143,7 +250,9 @@
font-size: $fontSize-28;
color: $color-darkGrey;
font-weight: 300;
- line-height: 1;
+ line-height: 0.265625rem /* 68/256 */;
+ height: 0.265625rem /* 68/256 */;
+ padding-left: 0;
}
.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
border-bottom:1Px solid $color-grey; /*no*/
@@ -151,8 +260,42 @@
.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*/
}
+ .el-table .el-table__cell{
+ padding:0;
+ }
}
</style>
-<style scoped>
-
+<style lang="scss" scoped>
+ @import "../../../assets/css/base";
+ .sanjiao-box{
+ line-height: 0.265625rem /* 68/256 */;
+ position: relative;
+ .paiming-box{
+ display: block;
+ color: $color-white;
+ position: absolute;
+ width: 0;
+ height: 0;
+ top: 0;
+ left: 0;
+ div{
+ position: relative;
+ left: 0px;
+ top: -0.3125rem /* -80/256 */;
+ color: #fff;
+ width: 0.1328125rem /* 34/256 */;
+ }
+ }
+ .red-sanjiao{
+ border-top: 0.265625rem /* 68/256 */ solid #FF0000;
+ border-right: 0.265625rem /* 68/256 */ solid transparent;
+ }
+ .green-sanjiao{
+ border-top: 0.265625rem /* 68/256 */ solid #3ABF21;
+ border-right: 0.265625rem /* 68/256 */ solid transparent;
+ }
+ .content{
+ /*line-height: 0.265625rem !* 68/256 *!;*/
+ }
+ }
</style>
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
index 8e6d7a3..2de4d00 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
@@ -1,6 +1,6 @@
<template>
<div class="biyeshengStatistics-wrap">
- <table class="biyeshengStatistics-table">
+ <!--<table class="biyeshengStatistics-table">
<thead>
<tr>
<th colspan="1">搴忓彿</th>
@@ -251,16 +251,187 @@
<td colspan="2">45682</td>
</tr>
</tbody>
- </table>
+ </table>-->
+ <el-table
+ :data="tableData"
+ :span-method="objectSpanMethod"
+ border>
+ <el-table-column
+ align="center"
+ type="index">
+ </el-table-column>
+ <template v-for="(item,index) in heardArry">
+ <el-table-column
+ align="center"
+ :prop="item"
+ :label="item">
+ </el-table-column>
+ </template>
+ <!--<el-table-column
+ align="center"
+ prop="xiangmu"
+ label="椤圭洰"
+ width="300">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="year"
+ label="2017骞�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="year"
+ label="2018骞�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="year"
+ label="2019骞�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="year"
+ label="2020骞�">
+ </el-table-column>-->
+ </el-table>
</div>
</template>
<script>
+ import {getGraduateTable} from '@/api/jiuyeAndChuangye'
export default {
- name: "biyeshengStatistics"
+ 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
+ }],
+ heardArry: [],
+ rowIndexArr: []//瀛樺偍鍚堝苟鍗曞厓鏍肩殑寮�濮嬩綅缃�
+ }
+ },
+ mounted() {
+ this.getGraduateTable()
+ },
+ methods: {
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+
+ },
+ getGraduateTable() {
+ getGraduateTable().then(res => {
+ if(res.code == 1000) {
+ let result = res.list
+ let head = []
+ let rows = []
+ head.push('椤圭洰')
+ if(!result) {
+ this.tableData = []
+ this.heardArry = []
+ }
+ result.forEach((item,index) => {
+ item.typeList && item.typeList.forEach((e,i) => {
+ console.log('e------------e',e.name)
+ console.log(rows[0],'0000000000000000000000000')
+ 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')
+ }
+
+ 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')
+ })
+ })
+ })
+ this.tableData = rows
+ this.heardArry = head
+ console.log('this.tableData----this.tableData-----',this.tableData)
+ }
+ })
+ // 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)
+ }
+ }
}
</script>
+<style lang="scss">
+ @import "../../../../assets/css/base";
+ .biyeshengStatistics-wrap{
+ .el-table tr{
+ background-color: #CEF2FF;
+ }
+ .el-table th.el-table__cell{
+ background-color: #51D2FF;
+ }
+ .el-table__fixed, .el-table__fixed-right,.el-table__fixed-right::before, .el-table__fixed::before{
+ background-color: #51D2FF;
+ }
+ .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell{
+ background-color: #A8E9FF;
+ }
+ .el-table thead{
+ color: #111111;
+ }
+ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+ border-bottom: 1Px solid #8E8E8E;
+ }
+ .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
+ border-right: 1Px solid #8E8E8E;
+ }
+ .el-table .el-table__cell{
+ padding: 0.0859375rem /* 22/256 */ 0;
+ }
+ .el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row>td.el-table__cell{
+ background: transparent;
+ }
+ .el-table .cell{
+ font-size: $fontSize-28;
+ color: $color-darkGrey;
+ font-weight: 300;
+ line-height: 1;
+ }
+ }
+</style>
+
<style lang="scss" scoped>
@import "../../../../assets/css/base";
.biyeshengStatistics-wrap{
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
index c0214dd..4ad47eb 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
@@ -180,7 +180,7 @@
},
mounted() {
this.getLoanTable()
- this.getParkTable()
+ this.getParkTable()
},
methods: {
getLoanTable() {
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue
index 7a6dc2a..1a5b1bd 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/jiuyeQingkuang.vue
@@ -1,24 +1,29 @@
<template>
<div class="jiuyeQingkuang-wrap">
<h1>鍚勫幙锛堝競銆佸尯锛�2021骞村氨涓氭儏鍐电粺璁¤〃</h1>
- <el-tabs v-model="activeName">
- <el-tab-pane label="鍩庨晣鏂板灏变笟" name="first">
- <chengzhenXinzengJiuye></chengzhenXinzengJiuye>
+ <el-tabs v-model="activeName" @tab-click="tabHandleClick">
+ <el-tab-pane
+ v-for="(item,index) in tabMenuList"
+ :key="item.id"
+ :label="item.name"
+ :name="item.id + ''">
+ <chengzhenXinzengJiuye ref="chengzhenXinzengJiuye" :tableData="tableData"></chengzhenXinzengJiuye>
</el-tab-pane>
- <el-tab-pane label="澶变笟鍐嶅氨涓�" name="second">
- <chengzhenXinzengJiuye></chengzhenXinzengJiuye>
+ <!--<el-tab-pane label="澶变笟鍐嶅氨涓�" name="2">
+ <chengzhenXinzengJiuye ref="chengzhenXinzengJiuye"></chengzhenXinzengJiuye>
</el-tab-pane>
- <el-tab-pane label="灏变笟鍥伴毦浜哄憳鍐嶅氨涓�" name="third">
- <chengzhenXinzengJiuye></chengzhenXinzengJiuye>
+ <el-tab-pane label="灏变笟鍥伴毦浜哄憳鍐嶅氨涓�" name="3">
+ <chengzhenXinzengJiuye ref="chengzhenXinzengJiuye"></chengzhenXinzengJiuye>
</el-tab-pane>
- <el-tab-pane label="鐧昏澶变笟鐜�" name="fourth">
- <chengzhenXinzengJiuye></chengzhenXinzengJiuye>
- </el-tab-pane>
+ <el-tab-pane label="鐧昏澶变笟鐜�" name="4">
+ <chengzhenXinzengJiuye ref="chengzhenXinzengJiuye"></chengzhenXinzengJiuye>
+ </el-tab-pane>-->
</el-tabs>
</div>
</template>
<script>
+ import {getEmployTable} from '@/api/jiuyeAndChuangye'
import chengzhenXinzengJiuye from "../../../components/jiuyeQingkuang/chengzhenXinzengJiuye";
export default {
name: "jiuyeQingkuang",
@@ -27,7 +32,39 @@
},
data() {
return {
- activeName: 'first'
+ activeName: '1',
+ type: '1',
+ tableData: [],
+ //'鍩庨晣鏂板灏变笟','澶变笟鍐嶅氨涓�','灏变笟鍥伴毦浜哄憳鍐嶅氨涓�','鐧昏澶变笟鐜�'
+ tabMenuList: [{
+ name: '鍩庨晣鏂板灏变笟',
+ id: 1
+ },{
+ name: '澶变笟鍐嶅氨涓�',
+ id: 2
+ },{
+ name: '灏变笟鍥伴毦浜哄憳鍐嶅氨涓�',
+ id: 3
+ },{
+ name: '鐧昏澶变笟鐜�',
+ id: 4
+ }]
+ }
+ },
+ mounted() {
+ this.getEmployTable()
+ },
+ methods: {
+ getEmployTable() {
+ getEmployTable({type: this.type}).then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ tabHandleClick(tab, event) {
+ this.type = tab.name
+ this.getEmployTable()
}
}
}
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
index 663867c..ee46b68 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -9,7 +9,7 @@
style="width: 100%">
<el-table-column
fixed="left"
- prop="year"
+ prop="jyear"
label="骞翠唤"
align="center">
</el-table-column>
@@ -18,48 +18,46 @@
label="琛ヨ创鎬у煿璁�"
align="center">
<el-table-column
- prop="shengtingjihua"
+ prop="planTimes"
:label="'鐪佸巺璁″垝 \n 锛堜汉娆★級'"
align="center">
</el-table-column>
<el-table-column
- prop="shijipeixunjihua"
+ prop="realTimes"
:label="'瀹為檯鍩硅浜烘暟 \n 锛堜汉娆★級'"
align="center">
</el-table-column>
<el-table-column
- prop="wanchenglv"
+ prop="completionRate"
label="瀹屾垚鐜�"
align="center">
</el-table-column>
<el-table-column
- prop="zhuanzhangzhichu"
+ prop="expenditure"
:label="'涓撹处璧勯噾鏀嚭 \n 锛堜竾鍏冿級'"
align="center">
</el-table-column>
</el-table-column>
<el-table-column
- prop="name"
label="鍏朵腑搴斿眾姣曚笟瀛﹀勾楂樻牎姣曚笟鐢�"
align="center">
<el-table-column
- prop="peixunrenshu"
+ prop="graduateTrains"
:label="'鍩硅浜烘暟 \n 锛堜汉娆★級'"
align="center">
</el-table-column>
<el-table-column
- prop="butiejine"
+ prop="graduateSubsidy"
:label="'琛ヨ创閲戦 \n 锛堜竾鍏�)'"
align="center">
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
- prop="year"
label="绀句細鎬у煿璁�"
align="center">
<el-table-column
- prop="peixunrenci"
+ prop="graduateSubsidy"
label="瀹為檯鍩硅浜烘暟 锛堜汉娆★級"
align="center">
</el-table-column>
@@ -70,54 +68,40 @@
</template>
<script>
+ import {getTrainTable, getTrainChart} from '@/api/jiuyeAndChuangye'
import nowSize from "../../../../libs/nowSize";
export default {
name: "zhiyePeixun",
data() {
return {
- tableData:[{
- year: '2017骞�',
- shengtingjihua: '34212',
- shijipeixunjihua: '44333',
- wanchenglv: '90%',
- zhuanzhangzhichu: '233421',
- peixunrenshu: '3222',
- butiejine:'2322',
- peixunrenci:'34223'
- },{
- year: '2018骞�',
- shengtingjihua: '34212',
- shijipeixunjihua: '44333',
- wanchenglv: '90%',
- zhuanzhangzhichu: '233421',
- peixunrenshu: '3222',
- butiejine:'2322',
- peixunrenci:'34223'
- },{
- year: '2019骞�',
- shengtingjihua: '34212',
- shijipeixunjihua: '44333',
- wanchenglv: '90%',
- zhuanzhangzhichu: '233421',
- peixunrenshu: '3222',
- butiejine:'2322',
- peixunrenci:'34223'
- },{
- year: '2020骞�',
- shengtingjihua: '34212',
- shijipeixunjihua: '44333',
- wanchenglv: '90%',
- zhuanzhangzhichu: '233421',
- peixunrenshu: '3222',
- butiejine:'2322',
- peixunrenci:'34223'
- }]
+ tableData:[],
+ yearsData: [], //x杞存暟鎹�
+ numberData: [], //鏌辩姸鍥炬暟鎹紙瀹為檯鍩硅浜烘暟锛�
+ rateData: [], //鎶樼嚎鏁版嵁锛堝畬鎴愮巼锛�
}
},
mounted() {
- this.zhiyepeixunEcharts()
+ this.getTrainTable()
+ this.getTrainChart()
},
methods: {
+ getTrainTable() { //鏌ヨ鑱屼笟鍩硅缁熻琛ㄦ牸鏁版嵁鎺ュ彛
+ getTrainTable().then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ getTrainChart() {
+ getTrainChart().then(res => {
+ if(res.code == 1000) {
+ this.yearsData = res.obj.years
+ this.numberData = res.obj.number
+ this.rateData = res.obj.rate
+ this.zhiyepeixunEcharts()
+ }
+ })
+ },
handleheader(data) {
return {
lineHeight: '0',
@@ -170,7 +154,7 @@
xAxis: [
{
type: 'category',
- data: ['2017骞�', '2018骞�', '2019骞�', '2020骞�', '2021骞�', '2022骞�', '2023骞�'],
+ data: this.yearsData,
axisPointer: {
type: 'shadow'
},
@@ -237,9 +221,7 @@
return value + ' ml';
}
},
- data: [
- 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
- ]
+ data: this.numberData
},
{
name: '瀹屾垚鐜�',
@@ -250,7 +232,7 @@
return value + ' 掳C';
}
},
- data: [2.0, 4.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2]
+ data: this.rateData
}
]
};
--
Gitblit v1.9.1