From 1788c96aea9247cc36ef8b82734997f1a6a92fb4 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 八月 2024 11:07:42 +0800
Subject: [PATCH] 新增新版本。静安区特供版
---
src/views/realtimemode/RealtimeMode.vue | 143 +++++++++++++++++++++++++++++------------------
1 files changed, 87 insertions(+), 56 deletions(-)
diff --git a/src/views/realtimemode/RealtimeMode.vue b/src/views/realtimemode/RealtimeMode.vue
index 6cc8bfd..f6ff253 100644
--- a/src/views/realtimemode/RealtimeMode.vue
+++ b/src/views/realtimemode/RealtimeMode.vue
@@ -1,6 +1,8 @@
<template>
<div class="p-events-none m-t-2">
- <el-row justify="center" align="middle" class="top-wrap"> </el-row>
+ <el-row justify="center" align="middle" class="top-wrap">
+ <DeviceChange @change="onDeviceChange"></DeviceChange>
+ </el-row>
<el-row class="m-t-2">
<FactorRadio
:device-type="deviceType"
@@ -13,9 +15,7 @@
:factor="factorDatas.factor[factorType]"
></FactorLegend>
</el-row>
- <el-row class="m-t-2" justify="start">
- <DashBoard :factor-datas="factorDatas"></DashBoard>
- </el-row>
+ <DashBoard class="dash-board" :factor-datas="factorDatas"></DashBoard>
<RealTimeTrend
class="real-time-trend"
:factor-datas="factorDatas"
@@ -25,18 +25,25 @@
</template>
<script>
+import moment from 'moment';
import { useFetchData } from '@/composables/fetchData';
import { TYPE0 } from '@/constant/device-type';
+import { radioOptions } from '@/constant/radio-options';
import { FactorDatas } from '@/model/FactorDatas';
-import monitorDataApi from '@/api/monitorDataApi';
import DashBoard from './component/DashBoard.vue';
import RealTimeTrend from './component/RealTimeTrend.vue';
-import { MapAnimation } from '@/utils/map/animation';
+import DeviceChange from './component/DeviceChange.vue';
+import { realTimeMapAnimation } from '@/utils/map/animation';
+import {
+ fetchHistoryData,
+ startLoopFetchRealTimeData,
+ clearFetchingTask
+} from '@/utils/factor/data';
-const mapAnimation = new MapAnimation();
+// const mapAnimation = new MapAnimation();
export default {
- components: { DashBoard, RealTimeTrend },
+ components: { DashBoard, RealTimeTrend, DeviceChange },
setup() {
const { loading, fetchData } = useFetchData(10000);
return { loading, fetchData };
@@ -45,25 +52,44 @@
return {
// 鐩戞祴璁惧绫诲瀷
deviceType: TYPE0,
- deviceCode: '0a0000000001',
+ deviceCode: '',
// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
- factorType: '1',
+ factorType: radioOptions(TYPE0)[0].value,
// 鏂拌幏鍙栫殑鐩戞祴鏁版嵁
factorDatas: new FactorDatas(),
// 鍏ㄩ儴鐩戞祴鏁版嵁
allFactorDatas: new FactorDatas()
};
},
+ watch: {
+ factorType(nV, oV) {
+ if (nV != oV) {
+ realTimeMapAnimation.setFactorType(nV);
+ }
+ }
+ },
computed: {
+ // 鏁版嵁鏈�鏂版椂闂达紙鏈�鏂版暟鎹殑閲囨牱鏃堕棿鍔�1绉掞紱娌℃湁鏁版嵁鏃讹紝閲囩敤褰撳墠鏃堕棿鐨勫墠6鍒嗛挓锛�
latestTime() {
if (this.factorDatas.times.length == 0) {
- return '----/--/-- --:--:--';
+ return moment().subtract(6, 'm').format('YYYY-MM-DD HH:mm:ss');
} else {
- return this.factorDatas.times[this.factorDatas.times.length - 1];
+ const _time = this.factorDatas.times[this.factorDatas.times.length - 1];
+ return moment(_time).add(1, 's').format('YYYY-MM-DD HH:mm:ss');
}
}
},
methods: {
+ onDeviceChange({ type, deviceCode }) {
+ this.deviceType = type;
+ this.deviceCode = deviceCode;
+ this.clearFetchingTask();
+ realTimeMapAnimation.stop();
+ this.allFactorDatas.clearData();
+ this.factorDatas.clearData();
+ this.notFirstFetch = false;
+ this.fetchRealTimeData();
+ },
onFetchData(data) {
// todo 鏍规嵁璁惧绫诲瀷鍒囨崲鍦板浘鐩戞祴鍥犲瓙灞曠ず鍗曢�夋銆佹姌绾垮浘澶嶉�夋銆佹暟鎹〃鏍煎閫夋鐨勫洜瀛愮被鍨�
// this.deviceType = type;
@@ -75,49 +101,40 @@
});
},
fetchRealTimeData() {
- // fixme 2024.5.3 姝ゅ鍒濆鑾峰彇鐨勬暟鎹紝鍙傛暟搴旇鐢眘earchbar鍐冲畾锛屽悗缁慨鏀�
this.fetchData((page) => {
- return monitorDataApi
- .fetchHistroyData({
- deviceCode: this.deviceCode,
- startTime: '2021-11-04 09:53:35',
- page,
- perPage: 100
- })
- .then((res) => {
- this.onFetchData(res.data);
- this.onMapData(res.data);
- this.fetchNextData();
- });
+ return fetchHistoryData({
+ deviceCode: this.deviceCode,
+ // startTime: '2024-08-20 06:00:00',
+ // endTime: '2024-08-20 06:02:00',
+ page,
+ perPage: 100
+ }).then((res) => {
+ this.onFetchData(res.data);
+ this.onMapData(res.data);
+ // if (res.data.length > 0) {
+ // this.fetchNextData(res.data[res.data.length - 1].time);
+ // }
+ this.fetchNextData();
+ });
});
},
clearFetchingTask() {
- if (this.fetchingTask) {
- clearInterval(this.fetchingTask);
- }
+ clearFetchingTask();
},
fetchNextData() {
- this.clearFetchingTask();
- this.fetchingTask = setInterval(() => {
- if (this.isFetching) {
- return;
+ startLoopFetchRealTimeData(
+ () => {
+ return {
+ deviceCode: this.deviceCode,
+ updateTime: this.latestTime,
+ perPage: 10
+ };
+ },
+ (res) => {
+ this.onFetchData(res.data);
+ this.onMapData(res.data);
}
-
- this.isFetching = true;
- this.fetchData(() => {
- return monitorDataApi
- .fetchNextData({
- deviceCode: this.deviceCode,
- updateTime: this.latestTime,
- perPage: 2
- })
- .then((res) => {
- this.onFetchData(res.data);
- this.onMapData(res.data);
- })
- .finally(() => (this.isFetching = false));
- });
- }, 10000);
+ );
},
onMapData(dataList) {
let startIndex = this.allFactorDatas.length() - 1;
@@ -126,25 +143,39 @@
this.notFirstFetch = true;
}
startIndex = startIndex < 0 ? 0 : startIndex;
- this.allFactorDatas.addData(dataList, this.drawMode, () => {
- mapAnimation.moveAnimation(
- this.allFactorDatas,
- this.factorType,
- startIndex
- );
+ return new Promise((resolve, reject) => {
+ this.allFactorDatas.addData(dataList, this.drawMode, () => {
+ realTimeMapAnimation.moveAnimation(
+ this.allFactorDatas,
+ this.factorType,
+ startIndex
+ );
+ });
});
}
},
mounted() {
- this.fetchRealTimeData();
+ // this.fetchRealTimeData();
+ // startLoopFetchRealTimeData({
+ // compUser: 'user1',
+ // compPassword: 'User1@jingan',
+ // mn: 'TX105',
+ // dtFrom: '2024-08-07 10:00:00',
+ // dtTo: '2024-08-07 10:00:59'
+ // });
},
unmounted() {
this.clearFetchingTask();
- mapAnimation.stop();
+ realTimeMapAnimation.stop();
}
};
</script>
<style scoped>
+.dash-board {
+ position: absolute;
+ left: 0;
+ bottom: 2px;
+}
.real-time-trend {
position: absolute;
right: 0;
--
Gitblit v1.9.3