xzzn/movecheck
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:设备状态接口更新、删除无用逻辑

Browse Source
This commit is contained in:
吉浩茹
2025-11-14 11:06:48 +08:00
parent c8f7242f7c
commit 2cb78c4155
7 changed files with 143 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/components/AlarmRecord.vue
View File

@ -1,20 +1,6 @@
<template>
<view class="page-container alarm-record-container">
<!-- 页面头部 -->
<!-- <view class="page-header">
<view class="header-left">
<text class="page-title">报警记录</text>
</view>
<view class="header-right">
<view class="system-title">
<view class="system-title-icon">
<text class="icon">📋</text>
</view>
<text class="system-title-text">移动式检修车间系统</text>
</view>
</view>
</view> -->
<!-- 日期选择区域 -->
<view class="date-picker-container">
<picker
@ -39,9 +25,6 @@
<view class="table-cell header-cell content-column">内容</view>
<view class="table-cell header-cell type-column">种类</view>
<view class="table-cell header-cell time-column">时间</view>
<!-- <view class="table-cell header-cell level-column">级别</view> -->
<!-- <view class="table-cell header-cell action-column">处置</view> -->
<!-- <view class="table-cell header-cell action-time-column">时间</view> -->
</view>
<!-- 表格内容 -->
@ -70,12 +53,6 @@
<view class="table-cell content-column">{{ alarm.content }}</view>
<view class="table-cell type-column">{{ alarm.type }}</view>
<view class="table-cell time-column">{{ alarm.time }}</view>
<!-- <view class="table-cell level-column" :class="getLevelClass(alarm.level)"> -->
<!-- <view class="table-cell level-column">
{{ alarm.level }}
</view> -->
<!-- <view class="table-cell action-column">{{ alarm.action }}</view> -->
<!-- <view class="table-cell action-time-column">{{ alarm.actionTime }}</view> -->
</view>
</template>
@ -94,12 +71,7 @@
<view class="load-more-spinner"></view>
<text class="load-more-text">正在加载更多...</text>
</view>
<!-- 没有更多数据提示 -->
<!-- <view class="no-more-container" v-if="!hasMoreData && alarmList.length > 0 && !isLoadingMore">
<text class="no-more-text">已加载全部数据</text>
</view> -->
<!-- 底部间距，确保最后一条记录完全显示 -->
<view class="table-bottom-spacing"></view>
</scroll-view>
@ -138,29 +110,6 @@ const endTime = ref('');
// MQTT报警服务接口（预留）
const mqttAlarmService = {
// 连接MQTT服务器
// connect: async () => {
// console.log('MQTT报警服务连接中...');
// try {
// // 模拟连接延迟
// await new Promise(resolve => setTimeout(resolve, 1000));
// isConnected.value = true;
// console.log('MQTT报警服务连接成功');
// return Promise.resolve();
// } catch (error) {
// console.error('MQTT报警连接失败:', error);
// isConnected.value = false;
// return Promise.reject(error);
// }
// },
// 订阅报警数据
// subscribeAlarmData: () => {
// console.log('订阅系统报警数据');
// // 这里后期会实现真实的MQTT报警订阅
// return Promise.resolve();
// },
// 获取历史报警记录（分页）
getHistoryAlarms: async (page = 0, size = 20, isLoadMore = false) => {
try {
@ -193,8 +142,6 @@ const mqttAlarmService = {
}
}
console.log('📅 查询时间范围:', queryStartTime, '至', queryEndTime);
// 调用分页获取告警接口
const response = await alertApi.getListByCreateTime({
page: page,
@ -268,7 +215,6 @@ const mqttAlarmService = {
// 获取实时报警
getRealtimeAlarms: async () => {
console.log('获取实时报警');
try {
// 模拟实时报警数据
const contents = ['温度超标', '湿度异常', '压力偏高', '洁净度超标', '设备故障', '通讯中断'];
@ -319,7 +265,6 @@ const mqttAlarmService = {
// 确认报警
confirmAlarm: async (alarmId) => {
console.log('确认报警:', alarmId);
try {
// 模拟确认操作
await new Promise(resolve => setTimeout(resolve, 300));
@ -340,7 +285,6 @@ const mqttAlarmService = {
// 清空报警记录
clearAlarms: async () => {
console.log('清空报警记录');
try {
// 模拟清空操作
await new Promise(resolve => setTimeout(resolve, 300));
@ -401,20 +345,6 @@ const formatDateTime = (dateString) => {
}
};
// 获取级别样式类
const getLevelClass = (level) => {
switch (level) {
case 'A':
return 'level-a';
case 'B':
return 'level-b';
case 'C':
return 'level-c';
default:
return '';
}
};
// 滚动事件处理
let scrollTimer = null;
@ -434,8 +364,6 @@ const onScroll = (e) => {
};
const onScrollToLower = () => {
console.log('滚动到底部，尝试加载更多数据');
// 如果正在加载或没有更多数据，则不处理
if (isLoadingMore.value || !hasMoreData.value) {
console.log('正在加载中或无更多数据，跳过');
@ -457,19 +385,11 @@ const scrollToTop = () => {
// 日期选择处理，选择后直接查询
const onDateChange = async (e) => {
selectedDate.value = e.detail.value;
console.log('选择的日期:', selectedDate.value);
// 自动构建开始和结束时间
if (selectedDate.value) {
startTime.value = `${selectedDate.value} 00:00:00`;
endTime.value = `${selectedDate.value} 23:59:59`;
console.log('开始时间:', startTime.value);
console.log('结束时间:', endTime.value);
// 选择日期后直接查询
console.log('🔍 开始查询报警记录');
console.log('查询时间范围:', startTime.value, '至', endTime.value);
try {
// 重置分页状态
currentPage.value = 0;
@ -478,12 +398,6 @@ const onDateChange = async (e) => {
// 使用选择的日期范围查询
await mqttAlarmService.getHistoryAlarms(0, pageSize.value, false);
uni.showToast({
title: '查询成功',
icon: 'success',
duration: 1500
});
} catch (error) {
console.error('❌ 查询失败:', error);
}

34
src/components/SystemLog.vue
View File

@ -173,12 +173,10 @@ const formatDateTime = (dateString) => {
const mqttLogService = {
// 连接MQTT服务器
connect: async () => {
console.log('MQTT日志服务连接中...');
try {
// 模拟连接延迟
await new Promise(resolve => setTimeout(resolve, 1000));
isConnected.value = true;
console.log('MQTT日志服务连接成功');
return Promise.resolve();
} catch (error) {
console.error('MQTT日志连接失败:', error);
@ -189,14 +187,12 @@ const mqttLogService = {
// 订阅日志数据
subscribeLogData: () => {
console.log('订阅系统日志数据');
// 这里后期会实现真实的MQTT日志订阅
return Promise.resolve();
},
// 获取历史日志（分页）
getHistoryLogs: async (page = 0, size = 20, isLoadMore = false, queryDate = '') => {
console.log(`📄 加载第${page}页数据，每页${size}条，查询日期：${queryDate}`);
try {
if (!isLoadMore) {
isLoading.value = true;
@ -227,8 +223,6 @@ const mqttLogService = {
}
}
console.log('📅 查询时间范围:', queryStartTime, '至', queryEndTime);
// 构建查询参数
const params = {
page: page,
@ -258,11 +252,7 @@ const mqttLogService = {
// 更新分页状态
currentPage.value = page;
hasMoreData.value = newLogs.length === size; // 如果返回的数据少于请求的数量，说明没有更多数据
console.log(`✅ 第${page}页数据加载完成，共${newLogs.length}条`);
} catch (error) {
console.error('❌ 获取历史日志失败:', error);
if (!isLoadMore) {
// 首次加载失败时显示空数据
logList.value = [];
@ -277,7 +267,6 @@ const mqttLogService = {
// 断开连接
disconnect: () => {
console.log('MQTT日志服务断开连接');
isConnected.value = false;
// 这里后期会实现真实的MQTT断开
}
@ -316,14 +305,12 @@ const onScroll = (e) => {
};
const onScrollToLower = () => {
console.log('📜 滚动到底部，触发加载更多');
if (isLoadingMore.value || !hasMoreData.value) {
console.log('⏸️ 正在加载中或没有更多数据，跳过加载');
return;
}
const nextPage = currentPage.value + 1;
console.log(`📄 开始加载第${nextPage}页数据`);
mqttLogService.getHistoryLogs(nextPage, pageSize.value, true, props.queryDate);
};
@ -335,19 +322,10 @@ const scrollToTop = () => {
// 日期选择处理，选择后直接查询
const onDateChange = async (e) => {
selectedDate.value = e.detail.value;
console.log('选择的日期:', selectedDate.value);
// 自动构建开始和结束时间
if (selectedDate.value) {
startTime.value = `${selectedDate.value} 00:00:00`;
endTime.value = `${selectedDate.value} 23:59:59`;
console.log('开始时间:', startTime.value);
console.log('结束时间:', endTime.value);
// 选择日期后直接查询
console.log('🔍 开始查询系统日志');
console.log('查询时间范围:', startTime.value, '至', endTime.value);
try {
// 重置分页状态
currentPage.value = 0;
@ -356,12 +334,6 @@ const onDateChange = async (e) => {
// 使用选择的日期范围查询
await mqttLogService.getHistoryLogs(0, pageSize.value, false, selectedDate.value);
uni.showToast({
title: '查询成功',
icon: 'success',
duration: 1500
});
} catch (error) {
console.error('❌ 查询失败:', error);
}
@ -373,12 +345,8 @@ const onDateChange = async (e) => {
// 组件生命周期
onMounted(async () => {
try {
// 连接MQTT并初始化
// await mqttLogService.connect();
// await mqttLogService.subscribeLogData();
await mqttLogService.getHistoryLogs(0, pageSize.value, false, props.queryDate);
} catch (error) {
console.error('日志系统初始化失败:', error);
uni.showToast({
title: '连接失败',
icon: 'error'
@ -388,7 +356,6 @@ onMounted(async () => {
// 刷新数据方法
const refreshData = async () => {
console.log('🔄 刷新系统日志数据')
try {
// 重置分页状态
currentPage.value = 0;
@ -404,7 +371,6 @@ const refreshData = async () => {
// 按日期查询方法
const queryByDate = async (queryDate) => {
console.log('📅 按日期查询系统日志:', queryDate)
try {
// 重置分页状态
currentPage.value = 0;