From c4e9d054916c3f085329a67c7664b4c54f9137f9 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 07 五月 2024 17:36:09 +0800
Subject: [PATCH] 完成折线图相关功能的迁移
---
src/views/historymode/HistoryMode.vue | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index 50dc1f0..fc56796 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -1,12 +1,27 @@
<template>
- <div class="fy-container">
+ <div class="p-events-none m-t-2">
<el-row justify="center">
- <SearchBar search-time="" @search="fetchHistroyData"></SearchBar>
+ <SearchBar
+ :search-time="searchTime"
+ @search="fetchHistroyData"
+ ></SearchBar>
</el-row>
- <FactorRadio
- :device-type="deviceType"
- @change="(e) => (factorType = e)"
- ></FactorRadio>
+ <el-row class="m-t-2">
+ <FactorRadio
+ :device-type="deviceType"
+ @change="(e) => (factorType = e)"
+ ></FactorRadio>
+ </el-row>
+ <el-row class="m-t-2">
+ <FactorLegend
+ class="m-t-2"
+ :factor="factorDatas.factor[factorType]"
+ ></FactorLegend>
+ </el-row>
+ <TrendAnalysis
+ class="trend-analysis"
+ :factor-datas="factorDatas"
+ ></TrendAnalysis>
</div>
</template>
@@ -18,8 +33,10 @@
import moment from 'moment';
import { TYPE0 } from '@/constant/device-type';
import { FactorDatas } from '@/model/FactorDatas';
+import TrendAnalysis from './component/TrendAnalysis.vue';
export default {
+ components: { TrendAnalysis },
setup() {
const { loading, fetchData } = useFetchData(10000);
return { loading, fetchData };
@@ -60,8 +77,7 @@
// this.factorMode = factorMode;
// this.factorType = factorType;
// this.factorName = factorName;
- // this.factorDatas.refreshHeight(this.factorType + 1 + '');
- // this.refreshLegend(this.factorDatas);
+ this.factorDatas.refreshHeight(this.factorType);
// this.mapMaker.setFactorType(factorType);
// if (!this.mapMaker.runStatus()) {
@@ -99,7 +115,6 @@
deviceCode,
startTime,
endTime,
- type,
page,
perPage: pageSize
})
@@ -108,7 +123,7 @@
},
fetchRealTimeData() {
// fixme 2024.5.3 姝ゅ鍒濆鑾峰彇鐨勬暟鎹紝鍙傛暟搴旇鐢眘earchbar鍐冲畾锛屽悗缁慨鏀�
- this.fetchData((page, pageSize) => {
+ this.fetchData((page) => {
return monitorDataApi
.fetchHistroyData({
deviceCode: '0a0000000001',
@@ -118,8 +133,10 @@
})
.then((res) => {
if (res.data.length > 0) {
- const s = new Date(res.data[0].time);
- const e = new Date(res.data[res.data.length - 1].time);
+ const s = new Date(res.data[0].time.replace(' ', 'T'));
+ const e = new Date(
+ res.data[res.data.length - 1].time.replace(' ', 'T')
+ );
this.searchTime = [s, e];
}
this.onFetchData(TYPE0, res.data);
@@ -133,6 +150,9 @@
};
</script>
<style scoped>
-.fy-container {
+.trend-analysis {
+ position: absolute;
+ left: 0;
+ bottom: 2px;
}
</style>
--
Gitblit v1.9.3