From 3832a82fb79d4cec4cca5e2854e54953f2095ef8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 06 九月 2024 16:55:08 +0800
Subject: [PATCH] 1. 添加溯源清单功能 2. 修复切换至走航监测界面后，之前正在加载的历史数据依旧展示至地图的问题 3. 添加折线图下载图片功能； 4. 添加数据导出功能； 5. 添加设备管理功能； 6. 添加数据弹框和溯源清单开关功能； 7. 优化3D里面的颜色展示逻辑，底部颜色由原来的因子最小值颜色改为当前量级的上一个量级对应的颜色
---
src/components/search/SearchBar.vue | 74 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index 003c1a0..d28abc0 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -1,15 +1,24 @@
<template>
- <BaseCard class="map-date-selector flexbox-col align-items">
+ <BaseCard size="middle-s" direction="down">
<template #content>
<el-form :inline="true">
- <OptionMission v-model="formSearch.missionCode"></OptionMission>
- <OptionType v-model="formSearch.type"></OptionType>
+ <OptionMission v-model="mission"></OptionMission>
+ <OptionType v-model="formSearch.deviceType"></OptionType>
<OptionDevice
- :type="formSearch.type"
+ :type="formSearch.deviceType"
v-model="formSearch.deviceCode"
></OptionDevice>
- <OptionTime v-model="formSearch.timeArray"></OptionTime>
- <el-button type="primary" class="el-button-custom" @click="handleClick">
+ <OptionTime
+ v-model="formSearch.timeArray"
+ :start-date="dateRange[0]"
+ :end-date="dateRange[1]"
+ ></OptionTime>
+ <el-button
+ :loading="loading"
+ type="primary"
+ class="el-button-custom"
+ @click="handleClick"
+ >
鍒嗘瀽
</el-button>
</el-form>
@@ -21,34 +30,71 @@
// 鎼滅储妗�
export default {
props: {
+ loading: Boolean,
searchTime: Array
},
data() {
return {
+ mission: undefined,
formSearch: {
- missionCode: '',
- type: '',
+ deviceType: '',
deviceCode: '',
timeArray: []
- }
+ },
+ // 鍙�夋棩鏈熻寖鍥达紝鏍规嵁璧拌埅浠诲姟鍐冲畾
+ dateRange: []
};
},
emits: ['search'],
watch: {
searchTime(nV, oV) {
if (nV != oV) {
- this.timeArray = this.searchTime;
+ this.formSearch.timeArray = this.searchTime;
+ }
+ },
+ mission(nV, oV) {
+ if (nV != oV) {
+ this.formSearch.timeArray = [
+ new Date(nV.startTime),
+ new Date(nV.endTime)
+ ];
+ 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);
+ }
}
}
},
- method: {
+ methods: {
handleClick() {
- this.$emit('search', this.formSearch);
+ this.$emit('search', { ...this.formSearch, mission: this.mission });
}
}
};
</script>
-<style lang="scss">
-.fy-container {
+<style scoped lang="scss">
+.map-date-selector {
+ display: inline-block;
+ position: relative;
+ /* left: 0;
+ right: 0;
+ top: 0px; */
+ /* padding: 0 4px; */
+ /* color: ffffffbd; */
+ /* background-color: antiquewhite; */
+}
+
+.p-events-auto {
+}
+
+.el-form-item {
+ margin-bottom: 0px;
+ margin-right: 8px !important;
}
</style>
--
Gitblit v1.9.3