From 8d7f9672e81f2c7e93e4a960359c8395eda9fb22 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 14 五月 2024 17:37:27 +0800
Subject: [PATCH] 1.修复点击折线图后高亮定位点错误问题； 2.新增“分析”按钮点击加载动画
---
src/assets/common-style.css | 6 ++++++
src/components/monitor/DataTable.vue | 2 +-
src/views/historymode/HistoryMode.vue | 3 ++-
src/utils/map/dialog.js | 3 ++-
src/components/search/SearchBar.vue | 8 +++++++-
src/components/chart/ProgressLineChart.vue | 10 +++++++---
6 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/assets/common-style.css b/src/assets/common-style.css
index 83a6e27..f3d4346 100644
--- a/src/assets/common-style.css
+++ b/src/assets/common-style.css
@@ -521,4 +521,10 @@
.form-check-label {
white-space: nowrap;
+}
+
+.text-close {
+ color: var(--font-color);
+ font-size: 16px;
+ padding: 0px 4px;
}
\ No newline at end of file
diff --git a/src/components/chart/ProgressLineChart.vue b/src/components/chart/ProgressLineChart.vue
index 4aedf0a..7a40cc0 100644
--- a/src/components/chart/ProgressLineChart.vue
+++ b/src/components/chart/ProgressLineChart.vue
@@ -40,7 +40,9 @@
allSeries: [],
option: null,
pageSize: 200,
- progress: 0
+ progress: 0,
+ // 瀵瑰簲progress杩涘害涓嬶紝鎵�灞曠ず鏁版嵁鐨勮捣濮嬬储寮�
+ sIndex: 0
};
},
emits: ['chartClick'],
@@ -155,8 +157,9 @@
len = len < 0 ? 0 : len;
const sIndex = Math.round((len * this.progress) / 100);
const eIndex = sIndex + this.pageSize;
- const startPer = (sIndex / this.allXAxis.length) * 100;
+ const startPer = (this.sIndex / this.allXAxis.length) * 100;
const endPer = (eIndex / this.allXAxis.length) * 100;
+ this.sIndex = sIndex;
return { sIndex, eIndex, startPer, endPer };
}
},
@@ -166,7 +169,8 @@
mounted() {
this.lineChart = echarts.init(this.$refs.lineChart);
this.lineChart.on('click', (e) => {
- this.$emit('chartClick', e.dataIndex);
+ console.log(e);
+ this.$emit('chartClick', this.sIndex + e.dataIndex);
});
}
};
diff --git a/src/components/monitor/DataTable.vue b/src/components/monitor/DataTable.vue
index 029589e..2681130 100644
--- a/src/components/monitor/DataTable.vue
+++ b/src/components/monitor/DataTable.vue
@@ -5,7 +5,7 @@
ref="tableRef"
:data="showData"
v-loading="loading"
- table-layout="auto"
+ table-layout="fixed"
height="calc(94vh - var(--bevel-length-2))"
size="small"
:show-overflow-tooltip="true"
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index 1c1202d..4534886 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -9,7 +9,12 @@
v-model="formSearch.deviceCode"
></OptionDevice>
<OptionTime v-model="formSearch.timeArray"></OptionTime>
- <el-button type="primary" class="el-button-custom" @click="handleClick">
+ <el-button
+ :loading="loading"
+ type="primary"
+ class="el-button-custom"
+ @click="handleClick"
+ >
鍒嗘瀽
</el-button>
</el-form>
@@ -21,6 +26,7 @@
// 鎼滅储妗�
export default {
props: {
+ loading: Boolean,
searchTime: Array
},
data() {
diff --git a/src/utils/map/dialog.js b/src/utils/map/dialog.js
index f802c99..3f0101e 100644
--- a/src/utils/map/dialog.js
+++ b/src/utils/map/dialog.js
@@ -166,8 +166,9 @@
var titleD = document.createElement('div');
var closeX = document.createElement('i');
titleD.innerHTML = title;
- closeX.className = 'fa fa-times';
+ closeX.className = 'text-close';
$(closeX).attr('aria-hidden', 'true');
+ $(closeX).text('X');
closeX.onclick = function () {
marker.close();
marker.window.close();
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index e7b2ca9..1b21f51 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -4,6 +4,7 @@
<SearchBar
v-show="status == 0"
:search-time="searchTime"
+ :loading="loading"
@search="fetchHistroyData"
></SearchBar>
<TrajectoryState v-show="status != 0" :status="status"></TrajectoryState>
@@ -125,7 +126,7 @@
// 2. 缁樺埗瀵硅瘽妗�
DialogUtil.openNewWindow(this.factorDatas, index, () => {
// 绉婚櫎鎵囧舰鍖哄煙
- // clearSector3();
+ sector.clearSector();
});
},
onFetchData(type, data) {
--
Gitblit v1.9.3