提交优化代码

src/App.vue

@@ -35,7 +35,6 @@ export default {
     },
 
     onLaunch: function () {
-        console.log("App Launch");
         // this.$refs.alarModel.connectMQTTwo();
         // 初始化云开发
         if (wx.cloud) {
@@ -87,13 +86,9 @@ export default {
         });
     },
 
-    onShow: function () {
-        console.log("App Show");
-    },
+    onShow: function () {},
 
-    onHide: function () {
-        console.log("App Hide");
-    },
+    onHide: function () {},
 };
 </script>
 

src/components/component/alarModel.vue

@@ -501,6 +501,7 @@ export default {
                 this.sn = data.clientId;
                 this.eventListId = data.eventListId;
 
+                console.log(data, "接收到消息222:");
                 console.log(
                     "接收到消息:",
                     this.clientId,

src/components/js_sdk/index.js

@@ -7,7 +7,7 @@ http.setConfig(config => {
         if (!selectedService || selectedService == 'aloneServe') {
             config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         }
-        config.baseUrl = "https://radar-power.cn/portal-service-server/";
+        // config.baseUrl = "https://radar-power.cn/portal-service-server/";
     }
     if (__wxConfig.envVersion == 'trial') {
         let selectedService = uni.getStorageSync("sercviceChoice")

src/pages/home/home.vue

@@ -132,7 +132,7 @@
             </view>
             <image src="../../static/arrFour.png" class="warmImage"></image>
         </view>
-        <alarModel ref="alarModel" />
+        <alarModel v-if="isInitAlarm" />
     </view>
 </template>
 <script>
@@ -151,6 +151,7 @@ export default {
             warmDetail: [],
             warmList: [],
             weatherText: "",
+            isInitAlarm: false,
         };
     },
     computed: {},
@@ -288,30 +289,7 @@ export default {
                         // this.warmNum = res.data.data.total;
                         if (res.data.data.rows.length > 0) {
                             this.warmDetail = res.data.data.rows;
-                            const mergedMap = new Map();
-                            this.warmDetail.forEach((alarm) => {
-                                const devId = alarm.devId;
-                                if (mergedMap.has(devId)) {
-                                    const existingAlarm = mergedMap.get(devId);
-                                    const existingTime = new Date(
-                                        existingAlarm.createTime
-                                    );
-                                    const currentTime = new Date(
-                                        alarm.createTime
-                                    );
-
-                                    if (currentTime > existingTime) {
-                                        mergedMap.set(devId, alarm);
-                                    }
-                                } else {
-                                    mergedMap.set(devId, alarm);
-                                }
-                            });
-                            const entries = mergedMap.entries();
-                            // 遍历
-                            for (const [devId, object] of entries) {
-                                this.warmList.push(object);
-                            }
+                            this.warmList = res.data.data.rows;
                         }
                     }
                 });
@@ -328,7 +306,7 @@ export default {
             this.getShareNum();
             this.getWarmList();
             this.getWeather();
-            // this.$refs.alarModel.connectMQTTwo();
+            this.isInitAlarm = true;
         }
         // 配置服务器
         let selectedService = uni.getStorageSync("sercviceChoice");
@@ -337,7 +315,8 @@ export default {
         }
     },
     onHide() {
-        // this.$refs.alarModel.closemqtt();
+        this.isInitAlarm = false;
+        console.log("离开首页，销毁报警组件");
     },
 
     onShareAppMessage() {

src/pagesA/deviceDetail/deviceDetail.vue

@@ -264,7 +264,7 @@
                 </view>
             </view>
         </view>
-        <alarModel ref="alarModel" />
+        <!-- <alarModel ref="alarModel" /> -->
     </view>
 </template>
 <script>
@@ -425,7 +425,9 @@ export default {
                     if (err) {
                         console.error("订阅失败", err);
                     } else {
-                        console.log(`成功订阅设备主题: device/${clientId}`);
+                        console.log(
+                            `成功订阅设备主题: /dev/${clientId}/dsp_data`
+                        );
                     }
                 });
             });

src/pagesA/devices/devices.vue

@@ -59,7 +59,7 @@
                     <image src="../../static/ln_small.png" mode="" />
                 </view>
             </view>
-            <alarModel ref="alarModel" />
+            <alarModel v-if="isInitAlarmTwo" />
         </view>
     </view>
 </template>
@@ -215,10 +215,13 @@ export default {
     },
     onLoad() {},
     onShow() {
+        this.isInitAlarmTwo = true;
         this.queryList();
-        // this.$refs.alarModel.connectMQTTwo();
     },
-    onHide() {},
+    onHide() {
+        this.isInitAlarmTwo = false;
+        console.log("离开了设备列表，销毁报警组件");
+    },
 
     onPullDownRefresh() {
         uni.showNavigationBarLoading();