提交设备列表

src/pagesA/devices/devices.vue

@@ -68,12 +68,8 @@
                 </view>
             </view>
         </view>
-<<<<<<< HEAD
-        <tenMinutes v-if="isIniTenMinutes" />
-=======
 
         <alarModel v-if="isInitAlarm" />
->>>>>>> twoMqtt
     </view>
 </template>
 
@@ -85,11 +81,7 @@ export default {
             option: ["全部", "离线", "在线", "报警"],
             selectValue: 0,
             devs: [],
-<<<<<<< HEAD
-            isIniTenMinutes: "",
-=======
             isInitAlarm: false,
->>>>>>> twoMqtt
         };
     },
     methods: {
@@ -195,23 +187,14 @@ export default {
             }, 2000);
         },
     },
-    onLoad() {
-        this.isInitAlarm = true;
-    },
+    onLoad() {},
     onShow() {
         this.isInitAlarm = true;
         this.queryList();
-        this.isInitAlarm = true;
-    },
-    onHide() {
-        this.isInitAlarm = false;
     },
-<<<<<<< HEAD
-=======
     onHide() {
         this.isInitAlarm = false;
     },
->>>>>>> twoMqtt
     onUnload() {
         this.isInitAlarm = false;
     },