From 2fad1ef7d526569e2595f46e6b2e0a1a2f2467a6 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期一, 11 四月 2022 10:00:58 +0800
Subject: [PATCH] 职业培训
---
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue | 7 +++++++
src/assets/css/mixin.scss | 6 ++++++
src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue | 4 +++-
src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue | 3 +++
src/router/router.js | 9 +++++++++
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 15 +++++++++++++++
src/assets/css/base.scss | 2 ++
src/pages/show/index/index.vue | 4 ++--
8 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index a567667..8297b5e 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -12,3 +12,5 @@
$color-dark: #05336A;
$color-grey:#8E8E8E;
$color-darkGrey:#111111;
+
+
diff --git a/src/assets/css/mixin.scss b/src/assets/css/mixin.scss
new file mode 100644
index 0000000..01dcad0
--- /dev/null
+++ b/src/assets/css/mixin.scss
@@ -0,0 +1,6 @@
+@mixin overflow-y($h) {
+ max-height: $h;
+ overflow-y: auto;
+ touch-action: pan-y;
+ -webkit-overflow-scrolling: touch;
+}
diff --git a/src/pages/show/index/index.vue b/src/pages/show/index/index.vue
index 4c30389..e8375c5 100644
--- a/src/pages/show/index/index.vue
+++ b/src/pages/show/index/index.vue
@@ -738,6 +738,7 @@
</script>
<style lang="scss" scoped>
@import "../../../assets/css/base";
+ @import "../../../assets/css/mixin";
.index-wrap{
width: 100%;
height: 100%;
@@ -963,8 +964,7 @@
}
.shuju-scroll{
- height: 28rem /* 280/10 */;
- overflow-y: auto;
+ @include overflow-y(28rem)
}
.shuju-table-line2{
width: 100%;
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue b/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
index 981806a..dfaa66d 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
@@ -22,7 +22,7 @@
<h1>姣曚笟鐢熺粺璁�</h1>
</div>
</el-menu-item>
- <el-menu-item>
+ <el-menu-item index="/zhiyePeixun">
<div class="menu-left-block">
<h1>鑱屼笟鍩硅</h1>
</div>
@@ -68,6 +68,7 @@
</style>
<style lang="scss" scoped>
@import "../../../assets/css/base";
+ @import "../../../assets/css/mixin";
.jiuyeAndChuangye-wrap{
width: 100%;
padding: 2rem;
@@ -95,6 +96,7 @@
flex: 1;
padding: 0 2rem /* 20/10 */;
box-sizing: border-box;
+ @include overflow-y(140rem)
}
}
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
index 4d44f09..46502af 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue
@@ -266,6 +266,7 @@
.biyeshengStatistics-wrap{
width: 100%;
height: 100%;
+ overflow-y: auto;
.biyeshengStatistics-table{
width: 100%;
border: 1px solid $color-grey; /*no*/
@@ -285,6 +286,8 @@
}
tbody{
background-color: #CEF2FF;
+ height: 100rem;
+ overflow-y: auto;
tr{
height: 5.2rem;
}
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
new file mode 100644
index 0000000..36c342e
--- /dev/null
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -0,0 +1,15 @@
+<template>
+ <div class="zhiyePeixun-wrap">
+
+ </div>
+</template>
+
+<script>
+ export default {
+ name: "zhiyePeixun"
+ }
+</script>
+
+<style lang="css" scoped>
+
+</style>
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
index 609d115..7d0b9e9 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
@@ -134,6 +134,7 @@
</script>
<style lang="scss">
+ @import "../../../../assets/css/base";
.shehuiBaoxian-table{
.el-table tr{
background-color: #CEF2FF;
@@ -162,6 +163,12 @@
.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>
diff --git a/src/router/router.js b/src/router/router.js
index 4aaa8fc..0c3bc1a 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -55,6 +55,15 @@
import(
"@/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue"
)
+ },
+ {
+ path: "/zhiyePeixun",
+ meta: { title: "鑱屼笟鍩硅"},
+ name: "zhiyePeixun",
+ component: () =>
+ import(
+ "@/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue"
+ )
}
]
},
--
Gitblit v1.9.1