From f3e94105b7964e6c6473f64bd8fa2b9d67a1733b Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 14 Apr 2025 18:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index e39ea28..e9a86fd 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -96,7 +96,32 @@
:label="item.label"
:value="item.value"
/>
+
+ </el-select>
+ <el-date-picker
+ v-model="filters.cycleDateRange"
+ type="datetimerange"
+ range-separator="至"
+ start-placeholder="工单周期开始日期"
+ end-placeholder="工单周期结束时间日期"
+ class="filter-item"
+ style="width: 240px !important"
+ />
+ <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
+ <el-time-picker
+ style="width: 100px"
+ v-model="filters.deal_time"
+ placeholder="请选择执行时间"
+ prop="deal_time"
+ value-format="HH:mm"
+ :picker-options="{
+ selectableRange: '00:00 - 23:59',
+ }"
+ />
+ <el-col :span="8">
+ </el-col>
<el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
<el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
</div>
@@ -259,6 +284,14 @@
/>
</el-col>
</el-row>
+
+ <el-row :gutter="20" style="height: 400px">
+
+ <el-col :span="24">
+ 这里放地图
+ </el-col>
+
+ </el-row>
</el-form>
</el-dialog>
@@ -382,6 +415,7 @@
/>
</el-form-item>
+
<el-button
type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@@ -419,6 +453,14 @@
/>
</el-col>
</el-row>
+
+ <el-row :gutter="20" style="height: 400px">
+
+ <el-col :span="24">
+ 这里放地图
+ </el-col>
+
+ </el-row>
</el-form>
</el-dialog>
</basic-container>
@@ -658,12 +700,21 @@
file_id: this.filters.file_id || undefined,
status: this.filters.status !== '' ? Number(this.filters.status) : currentTab?.value,
dept_id: this.filters.department || undefined,
- start_date: this.filters.dateRange?.[0]
+ creat_start_date: this.filters.dateRange?.[0]
? this.formatDate(this.filters.dateRange[0])
: undefined,
- end_date: this.filters.dateRange?.[1]
+ create_end_date: this.filters.dateRange?.[1]
? this.formatDate(this.filters.dateRange[1]).replace('00:00:00', '23:59:59')
: undefined,
+
+ start_date: this.filters.cycleDateRange?.[0]
+ ? this.formatDate(this.filters.cycleDateRange[0])
+ : undefined,
+ end_date: this.filters.dateRacycleDateRangenge?.[1]
+ ? this.formatDate(this.filters.cycleDateRange[1]).replace('00:00:00', '23:59:59')
+ : undefined,
+ rep_fre_type: this.filters.rep_fre_type || undefined,
+ deal_time: this.filters.deal_time || undefined,
current: this.page.currentPage,
size: this.page.pageSize,
};
--
Gitblit v1.9.3