From 686f95dadb6d7f9a37e5425457ef8b89658df35f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 04 九月 2024 03:45:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/screen/components/select-item/index.vue | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue index 3869bec..f93947a 100644 --- a/src/views/screen/components/select-item/index.vue +++ b/src/views/screen/components/select-item/index.vue @@ -1,7 +1,6 @@ <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-tab-pane v-for="item in testData1" @@ -9,11 +8,6 @@ :name="item.value" ></el-tab-pane> </el-tabs> - <!-- <div> - <el-button> - - </el-button> - </div> --> </div> <!-- <div class="type-select"> <div class="select-label">鏁版嵁婧�</div> @@ -128,7 +122,7 @@ .select-container { position: absolute; top: 0px; - left: 20px; + left: 0px; display: flex; align-items: center; justify-content: space-between; @@ -165,7 +159,7 @@ display: flex; align-items: center; width: 320px; - margin-top: -15px + margin-top: -15px; } } ::v-deep .tabs-box { @@ -173,10 +167,14 @@ width: 40%; .el-tabs__item { color: #ffffff !important; + font-size: 20px; } .is-active { - color: #61aef7 !important; - background: linear-gradient(135deg, rgb(10,31,75), #003e5b) !important; + color: #66b5ff !important; + background: url("../../../../assets/images/screen/button1.png"); + background-size: cover !important; + background-repeat: no-repeat !important; + background-position: center center !important; } } ::v-deep .el-input__inner { @@ -192,11 +190,6 @@ ::v-deep .date-select .el-date-editor .el-range-separator { color: #4481dd !important; } -// .transparent-button { -// background-color: transparent; -// border-color: #23f0ed; -// color: #b944dd; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */ - // } /* 鍘绘帀tabs鏍囩鏍忎笅鐨勪笅鍒掔嚎 */ ::v-deep .el-tabs__nav-wrap::after { @@ -205,13 +198,12 @@ } /* 涓嬪垝绾垮垏鎹㈤珮浜� */ ::v-deep .el-tabs__active-bar { - background-color: #4481DD; + background-color: #4481dd; } -::v-deep .el-tabs__item{ - margin: 5px; - padding: 0px 10px !important; +::v-deep .el-tabs__item { + margin: 5px 30px; + padding: 0px 25px !important; border-radius: 5px; - background: linear-gradient(135deg, rgb(10,31,75), #599cbb); - + background: url("../../../../assets/images/screen/button.png"); } </style> -- Gitblit v1.8.0