From e5ca4e89309d87ef4eb05a117c28d88fb20633a3 Mon Sep 17 00:00:00 2001
From: kongfp <kongfp@qq.com>
Date: Fri, 7 Jul 2023 09:12:46 +0800
Subject: [PATCH] fix bugs
---
src/views/welcome/index.vue | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue
index 588d710..e0d4796 100644
--- a/src/views/welcome/index.vue
+++ b/src/views/welcome/index.vue
@@ -17,8 +17,10 @@ const formInline = ref({
date: [],
policeId: "",
event: "",
- violation: ""
+ violation: "",
+ violationType: ""
});
+
const currentPage = ref(1);
const totalNumber = ref(0);
const pageSize = ref(10);
@@ -68,6 +70,7 @@ function onSearch() {
police_id: formInline.value.policeId || undefined,
event_type: formInline.value.event || undefined,
violation: violationMap.value[formInline.value.violation] || undefined,
+ violation_type: formInline.value.violationType || undefined,
page: currentPage.value || undefined,
page_size: pageSize.value || undefined
},
@@ -132,7 +135,7 @@ function getEvents() {
})
.then(response => {
eventMap.value = response.data.data;
- console.log(eventMap.value);
+ // console.log(eventMap.value);
})
.catch(error => {
// console.log("请求失败");
@@ -141,6 +144,14 @@ function getEvents() {
}
+function pickerOptions(time){
+ return time.getTime() > Date.now()
+}
+
+const now_date = new Date();
+now_date.setMonth(now_date.getMonth() - 1)
+const lastMonth = now_date
+
onMounted(() => {
onSearch();
});
@@ -166,15 +177,18 @@ onMounted(() => {
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
+ :disabled-date="pickerOptions"
+ :default-value="lastMonth"
/>
</el-form-item>
<el-form-item label="警号:">
<el-input v-model="formInline.policeId" placeholder="警号" clearable style="width: 198px" />
</el-form-item>
- <el-form-item label="事件:">
+
+ <el-form-item label="违法行为:">
<!-- <el-input v-model="formInline.event" placeholder="事件"/>-->
- <el-select v-model="formInline.event" placeholder="选择事件" clearable @click="getEvents">
+ <el-select v-model="formInline.event" placeholder="违法行为" clearable @click="getEvents">
<el-option v-for="(event, type) in eventMap" :key="type" :label="event" :value="event"></el-option>
</el-select>
</el-form-item>
@@ -185,6 +199,10 @@ onMounted(() => {
</el-select>
</el-form-item>
+ <el-form-item label="违规行为:">
+ <el-input v-model="formInline.violationType" placeholder="违规行为" clearable style="width: 198px" />
+ </el-form-item>
+
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
@@ -205,7 +223,7 @@ onMounted(() => {
>
<el-table-column prop="record_time" sortable label="记录仪日期时间" />
<el-table-column prop="police_id" label="警号" />
- <el-table-column prop="event_type" label="事件">
+ <el-table-column prop="event_type" label="违法行为">
<template v-slot="scope">
<span>
{{ scope.row.event_type || "未定义事件" }}