From e765d3974558793043740a7ca46d6b1bc5e260d7 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 11 四月 2022 17:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
index d40c74a..80ad302 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -2,7 +2,7 @@
<div class="zhiyePeixun-wrap">
<el-table
:data="tableData"
- max-height="650"
+ :header-cell-style="handleheader"
style="width: 100%">
<el-table-column
prop="year"
@@ -117,6 +117,14 @@
peixunrenci:'34223'
}]
}
+ },
+ methods: {
+ handleheader(data) {
+ return {
+ lineHeight: '0',
+
+ }
+ }
}
}
</script>
@@ -126,13 +134,13 @@
.zhiyePeixun-wrap{
width: 100%;
height: 100%;
- margin-top: 2rem;
+ margin-top: 0.078125rem /* 20/256 */;
.el-table th.el-table__cell{
background-color:$color-blue;
- height: 8rem;
+ height: 0.3125rem /* 80/256 */;
}
.el-table tr{
- height: 8rem;
+ height: 0.3125rem /* 80/256 */;
}
.el-table tr:nth-child(odd){
background-color: #CEF2FF;
@@ -157,16 +165,16 @@
white-space:pre-line;
}
.el-table--border th.el-table__cell, .el-table__fixed-right-patch{
- border-bottom:1px solid $color-grey; /*no*/
+ border-bottom:1Px solid $color-grey; /*no*/
}
.el-table thead.is-group th.el-table__cell{
background-color: $color-blue;
}
.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
- border-bottom:1px solid $color-grey; /*no*/
+ border-bottom:1Px solid $color-grey; /*no*/
}
.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*/
+ border-right:1Px solid $color-grey; /*no*/
}
}
</style>
@@ -174,7 +182,7 @@
<style lang="scss" scoped>
.zhiyepeixun-echarts{
width: 100%;
- height: calc(100% - 68rem);
- margin-top: 2rem;
+ height: calc(100% - 2.65625rem /* 680/256 */);
+ margin-top: 0.078125rem /* 20/256 */;
}
</style>
--
Gitblit v1.9.1