fix:设备状态接口更新、删除无用逻辑
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user