Commit 8e5a31ef authored by zhengke's avatar zhengke

修改

parent 7aaf6646
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
no-data-label="暂无相关数据" flat class=" sticky-header-column-table no-bottom-table zk_Table" no-data-label="暂无相关数据" flat class=" sticky-header-column-table no-bottom-table zk_Table"
separator="none" :data="dataList" :columns="columns" row-key=""> separator="none" :data="dataList" :columns="columns" row-key="">
<tr slot="header"> <tr slot="header">
<q-th rowspan="2" style="text-align:left;"> <q-th rowspan="2" style="text-align:left;width:300px;">
名称 名称
</q-th> </q-th>
<q-th colspan="2">年份</q-th> <q-th colspan="2">年份</q-th>
<q-th rowspan="2">转化</q-th> <q-th rowspan="2">成长</q-th>
</tr> </tr>
<tr slot="header"> <tr slot="header">
<q-th> <q-th>
...@@ -29,6 +29,22 @@ ...@@ -29,6 +29,22 @@
<span v-if="dataList&&dataList.length>0">{{dataList[0].SecondYearStr}}</span> <span v-if="dataList&&dataList.length>0">{{dataList[0].SecondYearStr}}</span>
</q-th> </q-th>
</tr> </tr>
<template v-slot:body-cell-FirstYear="props" v-if="tabCheck==2">
<q-td style="text-align:center;">
{{props.row.FirstYear}}%
</q-td>
</template>
<template v-slot:body-cell-SecondYear="props" v-if="tabCheck==2">
<q-td style="text-align:center;">
{{props.row.SecondYear}}%
</q-td>
</template>
<template v-slot:body-cell-YearRate="props">
<q-td style="text-align:center;">
{{props.row.YearRate}}%
</q-td>
</template>
<!-- <template v-slot:header-cell-FirstYear="props"> <!-- <template v-slot:header-cell-FirstYear="props">
<q-th :props="props"> <q-th :props="props">
<span v-if="dataList&&dataList.length>0">{{dataList[0].FirstYearStr}}</span> <span v-if="dataList&&dataList.length>0">{{dataList[0].FirstYearStr}}</span>
...@@ -51,6 +67,10 @@ ...@@ -51,6 +67,10 @@
dataList: { dataList: {
type: Array, type: Array,
default: null default: null
},
tabCheck: {
type: Number,
default: null
} }
}, },
meta: { meta: {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</q-field> </q-field>
</div> </div>
</div> </div>
<yearFirst :dataList="dataList"></yearFirst> <yearFirst :dataList="dataList" :tabCheck="tabCheck"></yearFirst>
</div> </div>
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment