From f06841d8d1569f35128d428598a4b2e14402e73a Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 11 四月 2022 16:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://39.96.92.240:10000/r/jiashicang-front
---
src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue | 8
src/pages/show/jiuyeAndChuangye/jiuyeChildren/biyeshengStatistics.vue | 3
config/index.js | 2
src/router/router.js | 9 +
src/pages/components/showIndexTitle.vue | 34 +++--
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 180 ++++++++++++++++++++++++++++++
.postcssrc.js | 7 +
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue | 7 +
src/assets/css/mixin.scss | 6 +
src/pages/show/main/showHome.vue | 4
src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue | 4
index.html | 8
src/assets/css/main.css | 2
package.json | 4
src/assets/css/base.scss | 18 +-
src/pages/show/index/index.vue | 20 +-
16 files changed, 268 insertions(+), 48 deletions(-)
diff --git a/.postcssrc.js b/.postcssrc.js
index eee3e92..6e8fedd 100644
--- a/.postcssrc.js
+++ b/.postcssrc.js
@@ -5,6 +5,11 @@
"postcss-import": {},
"postcss-url": {},
// to edit target browsers: use "browserslist" field in package.json
- "autoprefixer": {}
+ "autoprefixer": {},
+ "postcss-px2rem-exclude": { // 娣诲姞鐨勪唬鐮�
+ remUnit: 256,
+ exclude: /node_modules|element/i // 蹇界暐node_modules鐩綍涓嬬殑鏂囦欢
+ }
+
}
}
diff --git a/config/index.js b/config/index.js
index c6ab343..3892e31 100644
--- a/config/index.js
+++ b/config/index.js
@@ -21,7 +21,7 @@
},
// Various Dev Server settings
- host: 'localhost', // can be overwritten by process.env.HOST
+ host: '192.168.0.110', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
diff --git a/index.html b/index.html
index c52d5d8..99bcb23 100644
--- a/index.html
+++ b/index.html
@@ -3,14 +3,16 @@
<head>
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/>
- <meta name="referrer" content="no-referrer">
+ <meta name="viewport" content="width=device-width,initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>瑙嗛绠＄悊</title>
<link rel="icon" type="image/x-icon" href="./src/assets/img/logo.ico" />
</head>
<body>
<div id="app"></div>
+ <script>
+ // 閫傞厤pad padPro
+ /(pad|pod|iPad|iPod|iOS)/i.test(navigator.userAgent)&&(head=document.getElementsByTagName('head'),viewport=document.createElement('meta'),viewport.name='viewport',viewport.content='target-densitydpi=device-dpi, width=480px, user-scalable=no',head.length>0&&head[head.length-1].appendChild(viewport));
+ </script>
</body>
-
</html>
diff --git a/package.json b/package.json
index de1d5b1..59466df 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
"plugins": {
"autoprefixer": {},
"postcss-px2rem-exclude": {
- "remUnit": 10,
- "exclude": "/node_modules/i"
+ "remUnit": 256,
+ "exclude": "/node_modules|element/i"
}
}
}
diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index a567667..1662eb6 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -1,14 +1,16 @@
-$fontSize-20: 2rem;
-$fontSize-24: 2.4rem;
-$fontSize-26: 2.6rem;
-$fontSize-28: 2.8rem;
-$fontSize-30: 3rem;
-$fontSize-32: 3.2rem;
-$fontSize-38: 3.8rem;
-$fontSize-48: 4.8rem;
+$fontSize-20: 0.078125rem /* 20/256 */;
+$fontSize-24: 0.09375rem /* 24/256 */;
+$fontSize-26: 0.1015625rem /* 26/256 */;
+$fontSize-28: 0.109375rem /* 28/256 */;
+$fontSize-30: 0.1171875rem /* 30/256 */;
+$fontSize-32: 0.125rem /* 32/256 */;
+$fontSize-38: 0.1484375rem /* 38/256 */;
+$fontSize-48: 0.1875rem /* 48/256 */;
$color-blue: #51D2FF;
$color-white: #fff;
$color-dark: #05336A;
$color-grey:#8E8E8E;
$color-darkGrey:#111111;
+
+
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 13ac0ae..ec0c398 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -526,6 +526,6 @@
@media screen and (min-width: 2560px) {
html {
- font-size: 10px!important;
+ font-size: 256px!important;
}
}
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/components/showIndexTitle.vue b/src/pages/components/showIndexTitle.vue
index 9997e49..538926a 100644
--- a/src/pages/components/showIndexTitle.vue
+++ b/src/pages/components/showIndexTitle.vue
@@ -91,15 +91,15 @@
.el-menu-item.is-active {
background: url("../../assets/images/menu-active.png") no-repeat center;
background-size: 100% 100%;
- width: 12.8rem /* 128/10 */;
- height: 5rem;
+ width: 0.5rem /* 128/256 */;
+ height: 0.1953125rem /* 50/256 */;
}
.el-menu-item {
background: url("../../assets/images/menu-normal.png") no-repeat center;
background-size: 100% 100%;
- width: 12.8rem /* 128/10 */;
- height: 5rem;
- margin-right: 1.2rem /* 12/10 */;
+ width: 0.5rem /* 128/256 */;
+ height: 0.1953125rem /* 50/256 */;
+ margin-right: 0.046875rem /* 12/256 */;
}
.el-menu.el-menu--horizontal {
border-bottom: 0;
@@ -109,22 +109,23 @@
<style lang="scss" scoped>
.showIndexTitle-wrap {
width: 100%;
- height: 9rem /* 90/10 */;
+ height: 0.3515625rem /* 90/256 */;
background: url("../../assets/images/jiashicang-title-bj.png") no-repeat
center;
background-size: 100% 100%;
.title {
- font-size: 3rem /* 30/10 */;
+ font-size: 0.1171875rem /* 30/256 */;
//font-family: "Source Han Sans CN";
color: #fff;
text-align: center;
- line-height: 7rem /* 70/10 */;
+ line-height: 0.2734375rem /* 70/256 */;
}
.showIndex-left {
position: absolute;
- left: 1rem /* 10/10 */;
- top: -5rem /* 10/10 */;
+ left: 0.0390625rem /* 10/256 */;
+ top: -0.1953125rem /* -50/256 */;
display: flex;
+ z-index: 9;
.showIndex-block {
/*background:url("../../assets/images/menu-normal.png") no-repeat center;*/
/*background-size: 100% 100%;*/
@@ -132,17 +133,18 @@
/*height: 5rem;*/
h1 {
color: #fff;
- font-size: 2.4rem;
+ font-size: 0.09375rem /* 24/256 */;
text-align: center;
- line-height: 5rem;
+ line-height: 0.1953125rem /* 50/256 */;
}
}
}
.showIndex-right {
position: absolute;
- right: 1rem /* 10/10 */;
- top: -5rem /* 10/10 */;
+ right: 0.0390625rem /* 10/256 */;
+ top: -0.1953125rem /* -50/256 */;
display: flex;
+ z-index: 9;
.showIndex-block {
/*background:url("../../assets/images/menu-normal.png") no-repeat center;*/
/*background-size: 100% 100%;*/
@@ -151,9 +153,9 @@
/*cursor: pointer;*/
h1 {
color: #fff;
- font-size: 2.4rem;
+ font-size: 0.09375rem /* 24/256 */;
text-align: center;
- line-height: 5rem;
+ line-height: 0.1953125rem /* 50/256 */;
}
}
.menu-active {
diff --git a/src/pages/show/index/index.vue b/src/pages/show/index/index.vue
index 4c30389..e2033e3 100644
--- a/src/pages/show/index/index.vue
+++ b/src/pages/show/index/index.vue
@@ -4,7 +4,7 @@
<div class="yanglao-block">
<img src="../../../assets/images/yanglao-icon1.png" alt="">
<h1>鍩庨晣鑱屽伐鍏昏�佷繚闄╁弬淇濅汉鏁�</h1>
- <h2><font class="bigger">277.8</font>涓囦汉</h2>
+ <h2><font class="bigger">277.7</font>涓囦汉</h2>
</div>
<div class="yanglao-block">
<img src="../../../assets/images/yanglao-icon2.png" alt="">
@@ -738,29 +738,30 @@
</script>
<style lang="scss" scoped>
@import "../../../assets/css/base";
+ @import "../../../assets/css/mixin";
.index-wrap{
width: 100%;
height: 100%;
- padding: 0 2rem /* 10/10 */;
+ padding: 0 0.078125rem /* 20/256 */;
box-sizing: border-box;
.index-line-box{
width: 100%;
display: flex;
- margin-top: 3.2rem;
+ margin-top: 0.125rem /* 32/256 */;
.yanglao-block{
- width: 59rem /* 590/10 */;
- height: 23rem /* 230/10 */;
+ width: 2.3046875rem /* 590/256 */;
+ height: 0.8984375rem /* 230/256 */;
background:url("../../../assets/images/yanglao-block-bj.png") no-repeat center;
background-size: 100% 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
- margin: 0 2rem;
+ margin: 0 0.078125rem /* 20/256 */;
position: relative;
img{
- width: 8rem;
- height: 8rem;
+ width: 0.3125rem /* 80/256 */;
+ height: 0.3125rem /* 80/256 */;
}
h1{
color: #fff;
@@ -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..8e1a052 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,14 +68,15 @@
</style>
<style lang="scss" scoped>
@import "../../../assets/css/base";
+ @import "../../../assets/css/mixin";
.jiuyeAndChuangye-wrap{
width: 100%;
padding: 2rem;
box-sizing: border-box;
display: flex;
.menu-left{
- width: 24rem /* 240/10 */;
- height: 124.9rem /* 1249/10 */;
+ width: 0.9375rem /* 240/256 */;
+ height: 135rem /* 1249/10 */;
background:url("../../../assets/images/jiuye-menu-bj.png") no-repeat center;
background-size: 100% 100%;
padding: 4rem 0;
@@ -95,6 +96,7 @@
flex: 1;
padding: 0 2rem /* 20/10 */;
box-sizing: border-box;
+ @include overflow-y(150rem)
}
}
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/chuangyeDanbaoDaikuan.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
index bb28ab5..6f3ad76 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/chuangyeDanbaoDaikuan.vue
@@ -125,7 +125,9 @@
table-layout: fixed;
thead{
background-color: $color-blue;
- height: 11.2rem /* 112/10 */;
+ tr{
+ height: 11.2rem /* 112/10 */;
+ }
th,td{
color: $color-darkGrey;
border:1px solid $color-grey; /*no*/
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
new file mode 100644
index 0000000..d40c74a
--- /dev/null
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -0,0 +1,180 @@
+<template>
+ <div class="zhiyePeixun-wrap">
+ <el-table
+ :data="tableData"
+ max-height="650"
+ style="width: 100%">
+ <el-table-column
+ prop="year"
+ label="骞翠唤"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column label="琛ヨ创鎬у煿璁�" align="center">
+ <el-table-column
+ label="琛ヨ创鎬у煿璁�"
+ align="center"
+ width="800">
+ <el-table-column
+ prop="shengtingjihua"
+ :label="'鐪佸巺璁″垝 \n 锛堜汉娆★級'"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="shijipeixunjihua"
+ :label="'瀹為檯鍩硅浜烘暟 \n 锛堜汉娆★級'"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="wanchenglv"
+ label="瀹屾垚鐜�"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="zhuanzhangzhichu"
+ :label="'涓撹处璧勯噾鏀嚭 \n 锛堜竾鍏冿級'"
+ align="center"
+ width="200">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏朵腑搴斿眾姣曚笟瀛﹀勾楂樻牎姣曚笟鐢�"
+ align="center"
+ width="400">
+ <el-table-column
+ prop="peixunrenshu"
+ :label="'鍩硅浜烘暟 \n 锛堜汉娆★級'"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="butiejine"
+ :label="'琛ヨ创閲戦 \n 锛堜竾鍏�)'"
+ align="center"
+ width="200">
+ </el-table-column>
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ prop="year"
+ label="绀句細鎬у煿璁�"
+ align="center">
+ <el-table-column
+ prop="peixunrenci"
+ label="瀹為檯鍩硅浜烘暟 锛堜汉娆★級"
+ align="center">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ <div class="zhiyepeixun-echarts"></div>
+ </div>
+</template>
+
+<script>
+ 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'
+ }]
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ @import "../../../../assets/css/base";
+ .zhiyePeixun-wrap{
+ width: 100%;
+ height: 100%;
+ margin-top: 2rem;
+ .el-table th.el-table__cell{
+ background-color:$color-blue;
+ height: 8rem;
+ }
+ .el-table tr{
+ height: 8rem;
+ }
+ .el-table tr:nth-child(odd){
+ background-color: #CEF2FF;
+ }
+ .el-table tr:nth-child(even){
+ background-color: #A8E9FF;
+ }
+ .el-table, .el-table__expanded-cell{
+ background-color: transparent;
+ }
+ .el-table thead{
+ color: $color-darkGrey;
+ }
+ .el-table{
+ color: $color-darkGrey;
+ }
+ .el-table .cell{
+ font-size: $fontSize-28;
+ color: $color-darkGrey;
+ font-weight: 300;
+ line-height: 1;
+ white-space:pre-line;
+ }
+ .el-table--border th.el-table__cell, .el-table__fixed-right-patch{
+ 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*/
+ }
+ .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*/
+ }
+ }
+</style>
+
+<style lang="scss" scoped>
+ .zhiyepeixun-echarts{
+ width: 100%;
+ height: calc(100% - 68rem);
+ margin-top: 2rem;
+ }
+</style>
diff --git a/src/pages/show/main/showHome.vue b/src/pages/show/main/showHome.vue
index b012357..6a16627 100644
--- a/src/pages/show/main/showHome.vue
+++ b/src/pages/show/main/showHome.vue
@@ -18,8 +18,8 @@
<style lang="scss" scoped>
@import "../../../assets/css/base";
.showHome-wrap{
- width: 256rem /* 2560/10 */;
- height: 160rem /* 1600/10 */;
+ width: 10rem /* 2560/256 */;
+ height: 6.25rem /* 1600/256 */;
background: url("../../../assets/images/jiashicang-bj.jpg") no-repeat center;
background-size: 100% 100%;
}
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