From c8315eb3969bd51bdd712d1b4d4d1cfc2bef243c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/select-item/index.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue
index 9a6d6bf..6144a10 100644
--- a/src/views/screen/components/select-item/index.vue
+++ b/src/views/screen/components/select-item/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="select-container">
<div class="tabs-box">
- <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button>
- <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <!-- <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button> -->
+ <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane
v-for="item in testData1"
:label="item.name"
:name="item.value"
></el-tab-pane>
- </el-tabs> -->
+ </el-tabs>
<!-- <div>
<el-button>
@@ -127,7 +127,7 @@
<style lang="scss" scoped>
.select-container {
position: absolute;
- top: 10px;
+ top: 0px;
left: 20px;
display: flex;
align-items: center;
@@ -165,15 +165,18 @@
display: flex;
align-items: center;
width: 320px;
+ margin-top: -15px
}
}
::v-deep .tabs-box {
+ margin-top: 5px;
width: 40%;
.el-tabs__item {
color: #ffffff !important;
}
.is-active {
- color: #4481dd !important;
+ color: #61aef7 !important;
+ background: url('../../../../assets/images/screen/button1.png');;
}
}
::v-deep .el-input__inner {
@@ -189,10 +192,25 @@
::v-deep .date-select .el-date-editor .el-range-separator {
color: #4481dd !important;
}
-.transparent-button {
- background-color: transparent;
- border-color: #23f0ed;
- color: #0d6adb; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+// .transparent-button {
+// background-color: transparent;
+// border-color: #23f0ed;
+// color: #b944dd; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+// }
+/* 鍘绘帀tabs鏍囩鏍忎笅鐨勪笅鍒掔嚎 */
+::v-deep .el-tabs__nav-wrap::after {
+ position: static !important;
+ /* background-color: #fff; */
+}
+/* 涓嬪垝绾垮垏鎹㈤珮浜� */
+::v-deep .el-tabs__active-bar {
+ background-color: #4481DD;
+}
+::v-deep .el-tabs__item{
+ margin: 5px 30px;
+ padding: 0px 25px !important;
+ border-radius: 5px;
+ background: url('../../../../assets/images/screen/button.png');
}
</style>
--
Gitblit v1.8.0