From 0a32f5094e5a2622ed148854f91b606910dec216 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期一, 11 四月 2022 18:49:16 +0800
Subject: [PATCH] 调整页面
---
src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue | 11 ++++-------
src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue | 1 +
src/assets/css/mixin.scss | 3 +--
src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue | 5 +++--
src/main.js | 4 ++++
package.json | 1 +
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 4 ++++
src/pages/show/shehuiBaozhang/shehuiBaozhang.vue | 17 ++++++++++-------
src/pages/show/index/index.vue | 3 ++-
9 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/package.json b/package.json
index 59466df..fd15e48 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"nprogress": "^0.2.0",
"postcss-px2rem-exclude": "^0.0.6",
"sass-loader": "^7.3.1",
+ "v-fit-columns": "^0.2.0",
"vcolorpicker": "^0.1.8",
"vue": "^2.6.11",
"vue-router": "^3.1.6",
diff --git a/src/assets/css/mixin.scss b/src/assets/css/mixin.scss
index 01dcad0..2342cee 100644
--- a/src/assets/css/mixin.scss
+++ b/src/assets/css/mixin.scss
@@ -1,5 +1,4 @@
-@mixin overflow-y($h) {
- max-height: $h;
+@mixin overflow-y() {
overflow-y: auto;
touch-action: pan-y;
-webkit-overflow-scrolling: touch;
diff --git a/src/main.js b/src/main.js
index d6c7118..55769b4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,11 @@
import { getStore, setStore, removeStore } from "./libs/store"
import store from './store'
import 'lib-flexible/flexible.js'
+
+import Plugin from 'v-fit-columns';
+
Vue.use(ElementUI);
+Vue.use(Plugin);
Vue.prototype.getStore = getStore;
Vue.prototype.setStore = setStore;
diff --git a/src/pages/show/index/index.vue b/src/pages/show/index/index.vue
index c87d040..3b3ec57 100644
--- a/src/pages/show/index/index.vue
+++ b/src/pages/show/index/index.vue
@@ -964,7 +964,8 @@
}
.shuju-scroll{
- @include overflow-y(280)
+ max-height: 1.09375rem /* 280/256 */;
+ @include overflow-y()
}
.shuju-table-line2{
width: 100%;
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue b/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
index 671a475..608af47 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeAndChuangye.vue
@@ -102,8 +102,9 @@
flex: 1;
padding: 0 0.078125rem /* 20/256 */;
box-sizing: border-box;
- @include overflow-y(150px);
- height: 100%;
+ height: 5.27344rem;
+ @include overflow-y()
+
}
}
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
index c3b68d7..a6afceb 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
@@ -4,7 +4,7 @@
<h1>鍔冲姩灏变笟缁熻琛�</h1>
<div class="danwei-box">鍗曚綅:浜�</div>
<el-table
- max-height="640"
+ :max-height="640"
:data="tableData"
:header-cell-style="handleheader"
stripe
@@ -14,14 +14,12 @@
align="center"
prop="date"
label="鎸囨爣鍚嶇О"
- fixed="left"
- width="220">
+ fixed="left">
</el-table-column>
<el-table-column
prop="name"
align="center"
- label="鍘诲勾瀹屾垚"
- width="180">
+ label="鍘诲勾瀹屾垚">
</el-table-column>
<el-table-column
prop="address"
@@ -91,8 +89,7 @@
<el-table-column
prop="address"
align="center"
- label="褰撳墠瀹屾垚鐜�"
- width="160">
+ label="褰撳墠瀹屾垚鐜�">
</el-table-column>
</el-table>
</div>
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
index 80ad302..a88dd41 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -1,10 +1,14 @@
<template>
<div class="zhiyePeixun-wrap">
<el-table
+ stripe
+ border
:data="tableData"
+ max-height="640"
:header-cell-style="handleheader"
style="width: 100%">
<el-table-column
+ fixed="left"
prop="year"
label="骞翠唤"
align="center"
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
index ced5111..306404d 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhang.vue
@@ -68,26 +68,27 @@
border-right:none;
}
.el-menu-item, .el-submenu__title{
- height: 8rem;
- margin: 3rem 0;
+ height: 0.3125rem /* 80/256 */;
+ margin: 0.1171875rem /* 30/256 */ 0;
}
.el-menu-item{
background:url("../../../assets/images/jiuye-menu-normal.png") no-repeat center;
background-size: 100% 100%;
- width: 19.2rem;
- height: 8rem;
+ width: 0.75rem /* 192/256 */;
+ height: 0.3125rem /* 80/256 */;
}
.el-menu-item.is-active{
background:url("../../../assets/images/jiuye-menu-active.png") no-repeat center;
background-size: 100% 100%;
- width: 19.2rem;
- height: 8rem;
+ width: 0.75rem /* 192/256 */;
+ height: 0.3125rem /* 80/256 */;
}
}
</style>
<style lang="scss" scoped>
@import "../../../assets/css/base";
+ @import "../../../assets/css/mixin";
.shehuiBaozhang-wrap{
width: 100%;
padding: 0.078125rem /* 20/256 */;
@@ -95,7 +96,7 @@
display: flex;
.shehuiBaozhang-menu-left{
width: 0.9375rem /* 240/256 */;
- height: 4.87890625rem /* 1249/256 */ /* 1249/10 */;
+ height: 5.2734375rem /* 1350/256 */;
background:url("../../../assets/images/jiuye-menu-bj.png") no-repeat center;
background-size: 100% 100%;
padding: 0.15625rem /* 40/256 */ 0;
@@ -115,6 +116,8 @@
flex: 1;
padding: 0 0.078125rem /* 20/256 */;
box-sizing: border-box;
+ height: 0.5859375rem /* 150/256 */;
+ @include overflow-y();
}
}
diff --git a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
index 4116178..489a704 100644
--- a/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
+++ b/src/pages/show/shehuiBaozhang/shehuiBaozhangChildren/shehuiBaoxian.vue
@@ -95,6 +95,7 @@
width="160">
</el-table-column>
</el-table>
+
</div>
</div>
</template>
--
Gitblit v1.9.1