Compare commits

..

No commits in common. "c0834c750b9874592179cbcf66a52e03448ba131" and "a06466d834594feef9f0b3d45e0ef20c39de4a8c" have entirely different histories.

1 changed files with 3 additions and 38 deletions

View File

@ -20,8 +20,8 @@
class="message-item"
>
<!-- 时间标签如果是第一条或者与上一条时间不同才显示 -->
<view class="time-label" v-if="index === 0 || !isSameMinute(item.createTime, messageList[index - 1].createTime)">
{{ formatTime(item.createTime) }}
<view class="time-label">
{{ item.createTime }}
</view>
<view class="champion-card">
@ -42,8 +42,8 @@
</template>
<script>
import Uuid from "@/tuniao-ui/libs/function/uuid";
import {listMessage} from "@/api/warn/message";
import * as mqttUtil from "@/utils/mqtt";
export default {
data() {
@ -70,22 +70,6 @@ export default {
// this.getSortDate();
this.getList()
},
onShow() {
console.info("消息日志监听")
mqttUtil.setOnMessageCallback(this.ackAlarm);
},
onHide() {
console.info("消息日志取消监听")
mqttUtil.removeOnMessageCallback();
},
onUnload() {
console.info("消息日志取消监听")
mqttUtil.removeOnMessageCallback();
},
beforeDestroy() {
console.info("消息日志取消监听")
mqttUtil.removeOnMessageCallback();
},
methods: {
//
@ -209,25 +193,6 @@ export default {
gotoDevice(item) {
this.$tab.navigateTo(item.linkUrl)
},
ackAlarm(topic, payload) {
const regex = /^device\/\d+\/alarm$/;
if (!regex.test(topic)) return;
let msgData = {};
// JSON
try {
msgData = JSON.parse(payload);
var msg = msgData.msgType
this.messageList.push(msg)
} catch (e) {
console.error("MQTT消息解析失败", e, payload);
} finally {
this.$nextTick(() => {
this.scrollId
= "item"+this.messageList[this.messageList.length-1].id;
})
}
}
}
}