提交告警弹窗

src/components/component/alarModel.vue

@@ -451,17 +451,8 @@ export default {
             let selectedService = uni.getStorageSync("sercviceChoice");
             if (!selectedService || selectedService == "aloneServe") {
                 if (__wxConfig.envVersion == "develop") {
-<<<<<<< HEAD
-                    // client = mqtt.connect(
-                    //     "wxs://api.radar-power.asia:8084/mqtt",
-                    //     params
-                    // );
-                    client = mqtt.connect(
-                        "wxs://radar-power.cn:8084/mqtt",
-=======
                     client = mqtt.connect(
                         "wxs://cmd.radar-power.cn/mqtt/",
->>>>>>> twoMqtt
                         params
                     );
                 }