From b52055a43a38d943e86ddb35e7763fbc94d46fa7 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 17:11:37 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/components/Form/CustomPicker.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/Form/CustomPicker.vue b/src/components/Form/CustomPicker.vue
index 21c0d00..dec17fc 100644
--- a/src/components/Form/CustomPicker.vue
+++ b/src/components/Form/CustomPicker.vue
@@ -1,10 +1,15 @@
<template>
- <el-date-picker
+ <el-time-picker
+ is-range
v-model="value1"
- type="dates"
- placeholder="������������"
- value-format="yyyy-MM-dd"
- />
+ range-separator="���"
+ start-placeholder="������������"
+ end-placeholder="������������"
+ placeholder="������������������"
+ size="inputSize"
+ value-format="yyyy-MM-dd HH"
+ >
+ </el-time-picker>
</template>
<script>
@@ -54,5 +59,5 @@
}
</script>
<style scoped>
-
+
</style>
--
Gitblit v1.8.0