root
/
agri-app
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善

feasure
lld 2026-03-08 21:11:34 +08:00
parent a7df117a65
commit 11feb967cc
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/home/control/automatic.vue
View File

@ -223,7 +223,7 @@
<uni-popup ref="sliderDialog" mode="center"> <uni-popup ref="sliderDialog" mode="center">
<view class="modal-container"> <view class="modal-container">
<view class="modal-title">{{ `【${selectedText} - 自动化】参数设置` }}</view> <view class="modal-title">{{ `【${selectedText} - 自动化】条件设置` }}</view>
<!-- 核心修改：给容器加 flex 布局样式 --> <!-- 核心修改：给容器加 flex 布局样式 -->
<view class="modal-slider"> <view class="modal-slider">
<text class="slider-label">{{ slider.title }}</text> <text class="slider-label">{{ slider.title }}</text>

32
pages/home/control/index.vue
View File

@ -402,7 +402,9 @@ export default {
ackMessage(topic, payload) { ackMessage(topic, payload) {
// 1. 先判断是否是目标订阅主题（如frontend/\\w+/control/\\w+"） // 1. 先判断是否是目标订阅主题（如frontend/\\w+/control/\\w+"）
if ((topic !== this.mqttConfig.subscribeTopic+"/ack") if ((topic !== this.mqttConfig.subscribeTopic+"/ack")
&& (topic !== this.mqttConfig.subscribeTopic+"/listener")) return; && (topic !== this.mqttConfig.subscribeTopic+"/listener")
&& topic !== this.mqttConfig.subscribeTopic+"/config") return;
const regexWithGroup = /^frontend\/[^/]+\/dtu\/\d+\/(.+)$/;
let msgData = {}; let msgData = {};
// 优化：捕获JSON解析异常 // 优化：捕获JSON解析异常
try { try {
@ -412,17 +414,22 @@ export default {
return; return;
} }
const matchResult = topic.match(regexWithGroup);
const tag = matchResult[1]; // 提取结果：'1234567890'
// 3. 区分“回执”和“其他内容” // 3. 区分“回执”和“其他内容”
if (msgData.prop && "suc" in msgData) { if (tag==='ack' && msgData.prop && "suc" in msgData) {
this.handleCommandAck(msgData); this.handleCommandAck(msgData);
} else if ("msg" in msgData && "clientId" in msgData) {
if (mqttUtil.getMqttState().clientId === msgData.clientId) {
this.$modal.msg(
`${msgData.msg}`
);
} }
} else { // else if (tag==='ack' && "msg" in msgData && "clientId" in msgData) {
this.handleOtherContent(msgData,payload) // if (mqttUtil.getMqttState().clientId === msgData.clientId) {
// this.$modal.msg(
// `${msgData.msg}`
// );
// }
// }
else {
this.handleOtherContent(msgData,tag)
} }
}, },
@ -456,10 +463,11 @@ export default {
console.log(`指令[${commandField}=${commandValue}]执行${isSuccess ? "成功" : "失败"}`); console.log(`指令[${commandField}=${commandValue}]执行${isSuccess ? "成功" : "失败"}`);
}, },
handleOtherContent(msgData,payload) { handleOtherContent(msgData,tag) {
// 业务逻辑：处理传感器数据、设备状态等 // 业务逻辑：处理传感器数据、设备状态等
// 设备状态展示 // 设备状态展示
if (this.value !== 1) { if (this.value === 1) return;
if (tag === 'listener') {
var arr = ['jbk', "jbg", "jm1k", "jm1g", "jm2k", "jm2g", "jm3k", "jm3g","jlk","jlg"] var arr = ['jbk', "jbg", "jm1k", "jm1g", "jm2k", "jm2g", "jm3k", "jm3g","jlk","jlg"]
const allKeysNumeric = Object.keys(msgData).some(key => arr.includes(key)); const allKeysNumeric = Object.keys(msgData).some(key => arr.includes(key));
if (allKeysNumeric) { if (allKeysNumeric) {
@ -476,7 +484,9 @@ export default {
this.fontStyle = 'font-size:16px;' this.fontStyle = 'font-size:16px;'
this.makeSpecialData(msgData, true); this.makeSpecialData(msgData, true);
} }
} else if (tag === 'config') {
if ("ventTotalLen" in msgData) { if ("ventTotalLen" in msgData) {
console.info("参数设置：自动校准风口：",msgData.ventTotalLen)
this.ventTotalLen = msgData.ventTotalLen; this.ventTotalLen = msgData.ventTotalLen;
} }
} }