From 4d5faa6fa6a2bc9174832d90fda20f3dbf370568 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 15:04:22 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-capacity-scope.vue | 2 +-
index.html | 5 +++++
src/App.vue | 7 +++++++
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/index.html b/index.html
index cd42218..ba5e1c3 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,11 @@
<link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
<link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
<link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" />
+ <style>
+ #app{
+ overflow: hidden;
+ }
+ </style>
</head>
<body>
<div id="app"></div>
diff --git a/src/App.vue b/src/App.vue
index 3a329af..786039a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -110,10 +110,17 @@
}
.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;
}
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index bb6e503..6dd3bbc 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -370,7 +370,7 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.name,
+ label: a.code,
value: a.code
})
})
--
Gitblit v1.9.3