From c2e36c45578e63ad17c5e258c92d62d9ae03dadb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 30 五月 2025 11:55:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue
---
src/views/realtimemode/RealtimeMode.vue | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/views/realtimemode/RealtimeMode.vue b/src/views/realtimemode/RealtimeMode.vue
index 41e5d4e..395cc4a 100644
--- a/src/views/realtimemode/RealtimeMode.vue
+++ b/src/views/realtimemode/RealtimeMode.vue
@@ -6,15 +6,18 @@
<el-row class="m-t-2">
<FactorRadio
:device-type="deviceType"
- @change="(e) => (factorType = e)"
+ v-model="factorType"
></FactorRadio>
</el-row>
<el-row class="m-t-2">
- <FactorLegend
- class="m-t-2"
- :factor="factorDatas.factor[factorType]"
- ></FactorLegend>
- <SourceTrace></SourceTrace>
+ <el-col span="1">
+ <FactorLegend
+ :factor="factorDatas.factor[factorType]"
+ ></FactorLegend>
+ </el-col>
+ <el-col span="1">
+ <SourceTrace v-model:factorType="factorType"></SourceTrace>
+ </el-col>
</el-row>
<DashBoard class="dash-board" :factor-datas="factorDatas"></DashBoard>
<RealTimeTrend
@@ -118,8 +121,8 @@
mode == 'debug'
? {
deviceCode: this.deviceCode,
- startTime: '2025-01-16 11:30:00',
- endTime: '2025-01-16 11:32:00',
+ startTime: '2025-01-16 11:34:00',
+ endTime: '2025-01-16 11:35:00',
page,
perPage: 100
}
@@ -145,14 +148,15 @@
return {
deviceCode: this.deviceCode,
updateTime: this.latestTime,
- perPage: 10
+ perPage: mode == 'debug' ? 1 : 10
};
},
(res) => {
this.onFetchData(res.data);
this.onMapData(res.data);
thirdPartyDataApi.fetchLatestData(this.deviceType, this.deviceCode);
- }
+ },
+ mode == 'debug' ? 4000 : undefined
);
},
onMapData(dataList) {
@@ -174,14 +178,9 @@
}
},
mounted() {
- // this.fetchRealTimeData();
- // startLoopFetchRealTimeData({
- // compUser: 'user1',
- // compPassword: 'User1@jingan',
- // mn: 'TX105',
- // dtFrom: '2024-08-07 10:00:00',
- // dtTo: '2024-08-07 10:00:59'
- // });
+ if (mode == 'debug') {
+ websocket.send('start');
+ }
},
unmounted() {
this.clearFetchingTask();
--
Gitblit v1.9.3