From 6b6eff08baa3d052b66fd2e68f1ac0d8495f6f8a Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 29 八月 2024 17:35:33 +0800
Subject: [PATCH] 修改历史数据获取逻辑
---
src/components/search/SearchBar.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index 4534886..d28abc0 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -3,12 +3,16 @@
<template #content>
<el-form :inline="true">
<OptionMission v-model="mission"></OptionMission>
- <OptionType v-model="formSearch.type"></OptionType>
+ <OptionType v-model="formSearch.deviceType"></OptionType>
<OptionDevice
- :type="formSearch.type"
+ :type="formSearch.deviceType"
v-model="formSearch.deviceCode"
></OptionDevice>
- <OptionTime v-model="formSearch.timeArray"></OptionTime>
+ <OptionTime
+ v-model="formSearch.timeArray"
+ :start-date="dateRange[0]"
+ :end-date="dateRange[1]"
+ ></OptionTime>
<el-button
:loading="loading"
type="primary"
@@ -31,12 +35,14 @@
},
data() {
return {
- mission: {},
+ mission: undefined,
formSearch: {
- type: '',
+ deviceType: '',
deviceCode: '',
timeArray: []
- }
+ },
+ // 鍙�夋棩鏈熻寖鍥达紝鏍规嵁璧拌埅浠诲姟鍐冲畾
+ dateRange: []
};
},
emits: ['search'],
@@ -52,8 +58,16 @@
new Date(nV.startTime),
new Date(nV.endTime)
];
- this.formSearch.type = nV.deviceType;
+ this.dateRange = [new Date(nV.startTime), new Date(nV.endTime)];
+ this.formSearch.deviceType = nV.deviceType;
this.formSearch.deviceCode = nV.deviceCode;
+
+ // 浠ｈ〃棣栨杩涘叆鐣岄潰锛屾鏃惰嚜鍔ㄦ墽琛岄涓换鍔＄殑鏁版嵁鏌ヨ鎿嶄綔
+ if (oV == undefined) {
+ setTimeout(() => {
+ this.handleClick();
+ }, 500);
+ }
}
}
},
@@ -64,7 +78,7 @@
}
};
</script>
-<style lang="scss">
+<style scoped lang="scss">
.map-date-selector {
display: inline-block;
position: relative;
@@ -78,4 +92,9 @@
.p-events-auto {
}
+
+.el-form-item {
+ margin-bottom: 0px;
+ margin-right: 8px !important;
+}
</style>
--
Gitblit v1.9.3