wangming hace 1 mes
padre
commit
d0cc779e5f

+ 5 - 19
src/components/component/alarModel.vue

@@ -417,20 +417,6 @@ export default {
         },
         // mqtt相关方法
         connectMQTTwo() {
-            // if (this.mqttClientTwo && this.mqttClientTwo.connected) {
-            //     console.log("MQTT连接已存在,无需重新创建", this.mqttClientTwo);
-            //     return;
-            // }
-            // if (this.mqttClientTwo) {
-            //     try {
-            //         this.mqttClientTwo.end();
-            //         this.mqttClientTwo = null;
-            //         console.log("清理旧MQTT连接");
-            //     } catch (e) {
-            //         console.error("清理连接时出错:", e);
-            //     }
-            // }
-
             if (this.mqttClientFlag) {
                 console.log("主题已订阅");
                 return;
@@ -463,14 +449,14 @@ export default {
             let selectedService = uni.getStorageSync("sercviceChoice");
             if (!selectedService || selectedService == "aloneServe") {
                 if (__wxConfig.envVersion == "develop") {
-                    client = mqtt.connect(
-                        "wxs://api.radar-power.asia:8084/mqtt",
-                        params
-                    );
                     // client = mqtt.connect(
-                    //     "wxs://radar-power.cn:8084/mqtt",
+                    //     "wxs://api.radar-power.asia:8084/mqtt",
                     //     params
                     // );
+                    client = mqtt.connect(
+                        "wxs://radar-power.cn:8084/mqtt",
+                        params
+                    );
                 }
                 if (__wxConfig.envVersion == "trial") {
                     client = mqtt.connect(

+ 10 - 2
src/pagesA/deviceSetting/deviceSetting.vue

@@ -58,6 +58,7 @@
                 <view class="btn1" @click="goMoreSetting">更多设置</view>
             </view>
         </view>
+        <tenMinutes v-if="isIniTenMinutes" />
     </view>
 </template>
 <script>
@@ -67,6 +68,7 @@ export default {
             devInfo: "",
             devName: "",
             position: "",
+            isIniTenMinutes: "",
         };
     },
     methods: {
@@ -142,13 +144,19 @@ export default {
         },
     },
     onLoad(options) {
+        this.isIniTenMinutes = true;
         this.devInfo = JSON.parse(options.devInfo);
     },
     onShow() {
+        this.isIniTenMinutes = true;
         this.getPosition(this.devInfo.installPosition);
     },
-    onUnload() {},
-    onHide() {},
+    onUnload() {
+        this.isIniTenMinutes = false;
+    },
+    onHide() {
+        this.isIniTenMinutes = false;
+    },
 };
 </script>
 <style lang="less">

+ 10 - 3
src/pagesA/devices/devices.vue

@@ -60,6 +60,7 @@
                 </view>
             </view>
         </view>
+        <tenMinutes v-if="isIniTenMinutes" />
     </view>
 </template>
 
@@ -71,6 +72,7 @@ export default {
             option: ["全部", "离线", "在线", "报警"],
             selectValue: 0,
             devs: [],
+            isIniTenMinutes: "",
         };
     },
     methods: {
@@ -176,13 +178,18 @@ export default {
             }, 2000);
         },
     },
-    onLoad() {},
+    onLoad() {
+        this.isInitAlarm = true;
+    },
     onShow() {
         this.queryList();
+        this.isInitAlarm = true;
+    },
+    onHide() {
+        this.isInitAlarm = false;
     },
-    onHide() {},
     onUnload() {
-        // this.isInitAlarm = false;
+        this.isInitAlarm = false;
     },
 
     onPullDownRefresh() {

+ 15 - 3
src/pagesA/my/my.vue

@@ -48,6 +48,8 @@
         </view>
 
         <view class="logoutBtn" @click="goLogout">退出登录</view>
+
+        <tenMinutes v-if="isIniTenMinutes" />
     </view>
 </template>
 
@@ -131,9 +133,19 @@ export default {
             });
         },
     },
-    onLoad() {},
-    onHide() {},
-    onUnload() {},
+    onShow() {
+        this.isIniTenMinutes = true;
+    },
+    onLoad() {
+        this.isIniTenMinutes = true;
+    },
+    onHide() {
+        this.isIniTenMinutes = false;
+    },
+
+    onUnload() {
+        this.isIniTenMinutes = false;
+    },
 };
 </script>