首页修改

pages/device/APF/detail.vue

@@ -1,7 +1,7 @@
 <template>
     <Cn-page :loading="loading" noPadding>
         <view slot="body">
-            <view class="detail" :style="{ opacity: domLoading ? '0' : '1' }">
+            <view class="detail" :style="{ opacity: domLoading ? '0' : '1' }" style="overflow: hidden">
                 <view class="detail-header">
                     <Cn-htmlToImg domId="header" @renderFinish="renderFinish">
                         <view class="header" id="header" ref="header" @click="previewImg">
@@ -331,7 +331,7 @@ export default {
                             this.timer = setInterval(() => {
                                 console.log('askDevData')
                                 this.client.publish(`/zl/askDevData/${this.devId}`)
-                            }, 10000)
+                            }, 1000 * 60)
                         }
                     })
                 })
@@ -346,9 +346,10 @@ export default {
                     console.log('连接断开')
                 })
                 .on('message', (topic, message) => {
-                    console.log('接收推送信息：', message.toString())
-                    if (!message.toString()) {
-                        return
+                    console.log('接收推送信息：', message.toString(), topic)
+                    if (topic !== `/zl/devData/${this.devId}`) return
+                    if ((!message.toString() || message.toString().length < 10) && this.loading) {
+                        this.$util.toast('该设备暂无数据')
                     }
                     this.loading = false
                     this.handlerData(JSON.parse(message.toString()))
@@ -389,6 +390,8 @@ export default {
             uni.setNavigationBarTitle({title: this.deviceInfo.devName || '设备详情'})
             this.topolodyData.filter((item) => {
                 let index = this.deviceInfo.appsLineTopologyDiagramPO.findIndex((element) => {
+                    element.label = element.name
+                    item.label = element.name
                     return element.linePostion === item.linePostion
                 })
                 if (index > -1) {