From f38cce238016a976ba65707db40d030c1a546484 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 06 May 2025 17:10:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 415355d..5e34cef 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -158,23 +158,26 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" class="date-picker" />
</el-form-item>
</el-col>
- <el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </el-col>
-
- <el-col :span="3">
- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
- :picker-options="{
- selectableRange: '00:00 - 23:59',
- }" />
+ <el-col :span="4">
+ <div class="flex">
+ <div class="flex-1">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </div>
+ <div class="flex-1">
+ <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
+ :picker-options="{
+ selectableRange: '00:00 - 23:59',
+ }" />
+ </div>
+ </div>
</el-col>
</el-row>
@@ -1297,5 +1300,16 @@
display: flex;
justify-content: center;
}
+
+.flex {
+ display: flex;
+}
+
+.flex-1 {
+ flex: 1;
+
+ &> ::v-deep(div) {
+ width: 100% !important;
+ }
+}
</style>
-`
--
Gitblit v1.9.3