From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/views/screen/components/select-item/index.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue
index 261d5f5..9a6d6bf 100644
--- a/src/views/screen/components/select-item/index.vue
+++ b/src/views/screen/components/select-item/index.vue
@@ -1,20 +1,20 @@
<template>
<div class="select-container">
<div class="tabs-box">
- <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>
</el-button>
</div> -->
</div>
-
<!-- <div class="type-select">
<div class="select-label">鏁版嵁婧�</div>
<el-select
@@ -127,7 +127,7 @@
<style lang="scss" scoped>
.select-container {
position: absolute;
- top: 0px;
+ top: 10px;
left: 20px;
display: flex;
align-items: center;
@@ -172,7 +172,7 @@
.el-tabs__item {
color: #ffffff !important;
}
- .is-active{
+ .is-active {
color: #4481dd !important;
}
}
@@ -189,4 +189,10 @@
::v-deep .date-select .el-date-editor .el-range-separator {
color: #4481dd !important;
}
+.transparent-button {
+ background-color: transparent;
+ border-color: #23f0ed;
+ color: #0d6adb; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+
+}
</style>
--
Gitblit v1.8.0