|
@@ -254,8 +254,6 @@ const uselistData = () => {
|
|
.then((res: any) => {
|
|
.then((res: any) => {
|
|
if (res && res.code === 200) {
|
|
if (res && res.code === 200) {
|
|
tabsdata.value = res.data;
|
|
tabsdata.value = res.data;
|
|
- // mqttTopics.value = [res.data[0].topic];
|
|
|
|
- // startMqtt(mqttTopics.value, handleMqttMessage);
|
|
|
|
} else {
|
|
} else {
|
|
console.log('获取数据失败');
|
|
console.log('获取数据失败');
|
|
}
|
|
}
|
|
@@ -274,33 +272,21 @@ const handleMqttMessage = (topic: string, message: any) => {
|
|
console.log(topic, data);
|
|
console.log(topic, data);
|
|
coalgasData.value = data.top;
|
|
coalgasData.value = data.top;
|
|
Datalist.value = data.buttom;
|
|
Datalist.value = data.buttom;
|
|
- // thawData.value = data.buttom.map((buttomItem: any) => {
|
|
|
|
- // // 处理 middleVo
|
|
|
|
- // const middleVoList = buttomItem.middleVo.flatMap((middleVo: any) => [middleVo.fan, ...middleVo.home]);
|
|
|
|
-
|
|
|
|
- // // 检查是否有 middleVos
|
|
|
|
- // let middleVosList = [];
|
|
|
|
- // if (buttomItem.middleVos && Array.isArray(buttomItem.middleVos)) {
|
|
|
|
- // // 处理 middleVos
|
|
|
|
- // middleVosList = buttomItem.middleVos.flatMap((middleVos: any) => [middleVos.fan, ...middleVos.home]);
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
- // // 合并 middleVo 和 middleVos 的结果
|
|
|
|
- // const flattenedList = [...middleVoList, ...middleVosList];
|
|
|
|
-
|
|
|
|
- // return { list: flattenedList };
|
|
|
|
- // });
|
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.error('解析消息失败:', error);
|
|
console.error('解析消息失败:', error);
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|
|
// 弹框事件
|
|
// 弹框事件
|
|
-const modal = ref(null);
|
|
|
|
|
|
+// const modal = ref(null);
|
|
|
|
|
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
console.log('Key pressed:', event.key); // 添加调试信息
|
|
console.log('Key pressed:', event.key); // 添加调试信息
|
|
- if (event.key === 'm' || event.key === 'M') {
|
|
|
|
|
|
+ // 检查是否按下了 Shift + M 且没有其他额外按键
|
|
|
|
+ if (event.shiftKey && (event.key === 'm' || event.key === 'M')) {
|
|
|
|
+ if (event.ctrlKey || event.altKey || event.metaKey) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
event.preventDefault(); // 阻止默认行为
|
|
event.preventDefault(); // 阻止默认行为
|
|
console.log('Opening modal...'); // 添加调试信息
|
|
console.log('Opening modal...'); // 添加调试信息
|
|
falog.value = true; // 直接设置 falog 为 true
|
|
falog.value = true; // 直接设置 falog 为 true
|