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/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue | 193 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 183 insertions(+), 10 deletions(-)
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
index 4d44f09..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,49 +251,222 @@
<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{
width: 100%;
height: 100%;
+ overflow-y: auto;
.biyeshengStatistics-table{
width: 100%;
- border: 1px solid $color-grey; /*no*/
+ border: 1Px solid $color-grey; /*no*/
border-collapse: collapse;
table-layout: fixed;
thead{
background-color: $color-blue;
tr{
- height: 5.2rem;
+ height: 0.25rem /* 64/256 */;
}
th,td{
color: $color-darkGrey;
- border:1px solid $color-grey; /*no*/
+ border:1Px solid $color-grey; /*no*/
font-weight: 300;
- font-size: $fontSize-24;
+ font-size: $fontSize-28;
}
}
tbody{
background-color: #CEF2FF;
+ height: 3.90625rem /* 1000/256 */;
tr{
- height: 5.2rem;
+ height: 0.25rem /* 64/256 */;
}
th,td{
color: $color-darkGrey;
text-align: center;
- border:1px solid $color-grey; /*no*/
+ border:1Px solid $color-grey; /*no*/
font-weight: 300;
- font-size: $fontSize-24;
+ font-size: $fontSize-28;
}
}
}
--
Gitblit v1.9.1