From fb3136514444c11c63d499a360fa5cb5f6815923 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 28 Mar 2025 11:27:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CommonDateTime.vue | 62 ++++++++++++------------------
1 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/src/components/CommonDateTime.vue b/src/components/CommonDateTime.vue
index efd1c5a..4e6fdc0 100644
--- a/src/components/CommonDateTime.vue
+++ b/src/components/CommonDateTime.vue
@@ -5,16 +5,10 @@
type="daterange"
range-separator="-"
start-placeholder="开始日期"
- end-placeholder="结束日期"
- >
+ end-placeholder="结束日期">
</el-date-picker>
<div class="time-card">
- <div
- class="card-item"
- :class="item == checked ? 'active' : ''"
- v-for="item in timeList"
- @click="timeClick(item)"
- >
+ <div class="card-item" :class="item==checked?'active':''" v-for="item in timeList" @click="timeClick(item)">
{{ item }}
</div>
</div>
@@ -23,37 +17,32 @@
<script setup>
const newTime = ref([]);
-let timeList = ['今日', '本周', '本月', '本年'];
+let timeList = ['今日','本周','本月','本年' ];
let checked = ref('今日');
-let timeClick = item => {
+let timeClick = (item) => {
checked.value = item;
-};
+}
</script>
<style scoped lang="scss">
.common-date-time {
position: relative;
- display: flex;
+ top: 19px;
+ display: flex ;
justify-content: space-between;
-
:deep(.el-date-editor) {
- box-shadow: none;
- width: 0;
- flex: 1;
- margin-right: 4px;
-
- background: rgba(0, 15, 34, 0.5);
+ background: rgba(0,15,34,0.5);
border-radius: 0px 0px 0px 0px;
- border: 1px solid #306fca;
+ border: 1px solid #306FCA;
height: 28px;
.el-input__wrapper {
background-color: transparent;
- box-shadow: 0 0 0 1px #0070ff;
+ box-shadow: 0 0 0 1px #0070FF;
&.is-focus {
- box-shadow: 0 0 0 1px #0070ff;
+ box-shadow: 0 0 0 1px #0070FF;
}
}
@@ -61,35 +50,34 @@
background-color: transparent;
color: #fff;
height: 28px;
-
&::placeholder {
color: rgba(255, 255, 255, 0.6);
}
}
}
-
.time-card {
- text-align: center;
- background: linear-gradient(270deg, #195bad 0%, rgba(25, 91, 173, 0) 100%);
- border: 1px solid #306fca;
- font-family: Source Han Sans CN, Source Han Sans CN, serif;
+ width: 156px;
+ height: 28px;
+ background: linear-gradient( 270deg, #195BAD 0%, rgba(25,91,173,0) 100%);
+ border-radius: 0px 0px 0px 0px;
+ border: 1px solid #306FCA;
+ font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
- color: #ffffff;
+ color: #FFFFFF;
display: flex;
- height: 28px;
-
.card-item {
- width: 39px;
- height: 100%;
- line-height: 26px;
+ width: 40px;
+ height: 28px;
+ line-height: 28px;
+ text-align: center;
cursor: pointer;
}
-
.active {
- background: linear-gradient(270deg, #19ad8d 0%, rgba(25, 173, 141, 0) 100%);
- box-shadow: inset 0px 0px 8px 0px rgba(0, 255, 200, 0.6);
+ background: linear-gradient( 270deg, #19AD8D 0%, rgba(25,173,141,0) 100%);
+ box-shadow: inset 0px 0px 8px 0px rgba(0,255,200,0.6);
border-radius: 0px 0px 0px 0px;
+ border: 1px solid #30CAA9;
}
}
}
--
Gitblit v1.9.3