From 04f8edb2ea9cf622ae982d25b415a4a1f7bbb111 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 16 七月 2024 14:51:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/App.vue | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 7ebe8dd..f010b6d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
<template>
- <div id="app">
- <router-view />
+ <div id="app" style="overflow: hidden;">
+ <router-view/>
</div>
</template>
@@ -26,7 +26,7 @@
</script>
<style>
@import url("../static/alifont/iconfont.css");
- /* @import url("//at.alicdn.com/t/c/font_4379269_2wteluxhkyd.css"); */
+ /* @import url("//at.alicdn.com/t/c/font_4457508_5ubi3w3kng.css"); */
* {
margin: 0;
@@ -102,6 +102,9 @@
padding: 6px 10px;
min-width: 0;
border-radius: 6px;
+ z-index: 9999999999 !important;
+ max-height: 80vh;
+ overflow-y: auto;
}
table {
@@ -109,8 +112,16 @@
}
.el-popover {
+ max-height: 80vh;
+ overflow-y: auto;
+ overflow-x: hidden;
padding: 0;
+ z-index: 9999 !important;
}
+
+ .el-popover::-webkit-scrollbar{
+ width: 0;
+ }
.el-popper .popper__arrow {
display: none;
@@ -135,14 +146,14 @@
color: #333;
}
- .has-gutter .el-table__cell .cell {
+ .el-table__header .has-gutter .el-table__cell .cell {
font-size: 14px !important;
font-weight: 500;
}
.cell {
color: #333;
- padding: 0 17px !important;
+ padding: 0 15px !important;
font-size: 12px;
}
@@ -163,7 +174,7 @@
font-size: 14px;
font-weight: 400;
color: #333;
- padding: 6px 17px !important;
+ padding: 6px 15px !important;
}
/* 鍏ㄥ眬鍒嗛〉鍣ㄦ牱寮� */
@@ -265,11 +276,46 @@
.el-divider {
margin: 10px 0;
}
-
+
.required-span{
color: red;
}
+ .luckysheet-cols-menu {
+ z-index: 9000;
+ }
+
+ .luckysheet-input-box {z-index:3000}
+
+ .luckysheet-wa-editor{
+ z-index: 9004 !important;
+ }
+
+ .luckysheet-share-logo,.luckysheet_info_detail_save,.luckysheet_info_detail_update{
+ visibility: hidden;
+ }
+
+ .el-loading-mask{
+ z-index: 9990;
+ }
+
/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
-</style>
\ No newline at end of file
+ /* 鍏ㄥ眬鎹㈣婧㈠嚭鏍峰紡 */
+ .ellipsis-multiline {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2; /* 瀹氫箟鏂囨湰鐨勮鏁� */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .el-cascader-menu__wrap{
+ height: 300px;
+ }
+
+ .el-table-filter__list-item{
+ font-size: 12px;
+ line-height: 32px;
+ }
+</style>
--
Gitblit v1.9.3