Browse Source

提交设备详情

wangming 2 months ago
parent
commit
5f8c4bbf05

+ 1 - 1
src/components/component/alarModel.vue

@@ -399,7 +399,7 @@ export default {
                     modelId: "iFJ2BNIQcd9WlUIaT7_l4Q",
                     nickName: "xx",
                     isCloud: true,
-                    payload: "payloadtest",
+                    payload: "radar-power.cn",
                 });
                 wx.redirectTo({
                     url: CallPagePlugin,

+ 1 - 0
src/components/js_sdk/index.js

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

+ 8 - 8
src/pages/home/home.vue

@@ -89,12 +89,12 @@
             v-if="shareNum > 0"
             :style="{ top: warnNum > 0 ? '280rpx' : '210rpx' }"
         >
-            <image src="../../static/ln_small.png" class="shareImage"></image>
-            <text class="shareTitle"
-                >您有<text class="shareNum">{{ shareNum }}</text
+            <image src="../../static/ln_small.png" class="shareimage"></image>
+            <text class="sharetitle"
+                >您有<text class="sharenum">{{ shareNum }}</text
                 >台设备待授权</text
             >
-            <image src="../../static/arrTwo.png" class="arrImage"></image>
+            <image src="../../static/arrTwo.png" class="arrimage"></image>
         </view>
 
         <view
@@ -509,23 +509,23 @@ export default {
         #6f4e37 0%,
         rgba(210, 180, 140, 0.3) 100%
     );
-    .shareImage {
+    .shareimage {
         width: 60rpx;
         height: 60rpx;
         border-radius: 50%;
     }
-    .shareTitle {
+    .sharetitle {
         margin-left: 20rpx;
         font-size: 28rpx;
         color: #ffffff;
         letter-spacing: 4rpx;
     }
-    .shareNum {
+    .sharenum {
         font-weight: bold;
         font-size: 28rpx;
         color: #ffffff;
     }
-    .arrImage {
+    .arrimage {
         width: 20rpx;
         height: 30rpx;
         margin-left: auto;

+ 14 - 4
src/pagesA/deviceDetail/deviceDetail.vue

@@ -264,7 +264,7 @@
                 </view>
             </view>
         </view>
-        <alarModel />
+        <!-- <alarModel /> -->
     </view>
 </template>
 <script>
@@ -413,9 +413,10 @@ export default {
             };
             let client = "";
             let selectedService = uni.getStorageSync("sercviceChoice");
-            if (!selectedService || selectedService == "aloneServe") {
-                client = mqtt.connect("wxs://radar-power.cn:8084/mqtt", params);
-            }
+            // if (!selectedService || selectedService == "aloneServe") {
+            //     client = mqtt.connect("wxs://radar-power.cn:8084/mqtt", params);
+            // }
+            client = mqtt.connect("wxs://radar-power.cn:8084/mqtt", params);
             // 存储client引用以便后续操作
             this.mqttClient = client;
 
@@ -498,7 +499,16 @@ export default {
                                 this.targetPoints[id].displayY = y;
                             }
                         });
+                        this.targetPoints.forEach((key) => {
+                            const id = key;
+                            if (!currentIds.has(id)) {
+                                delete this.targetPoints[id];
+                            }
+                        });
+
                         console.log("🚀🚀🚀🚀targets", this.targetPoints);
+                    } else {
+                        this.targetPoints.forEach((key) => delete targets[key]);
                     }
                 } catch (e) {
                     // console.error("MQTT消息解析失败", e);

+ 1 - 1
src/pagesA/devices/devices.vue

@@ -184,7 +184,7 @@ export default {
                                     const diff = Math.abs(
                                         currentTime - signalTime
                                     );
-                                    devs[i].judge = diff <= 10000; // 10秒内为 true
+                                    devs[i].judge = diff <= 5000; // 10秒内为 true
                                 }
                             }
                             // devs[i].signalTime = common.timestampToTime(

+ 2 - 2
src/pagesA/my/my.vue

@@ -27,7 +27,7 @@
                     <image src="../../static/arrTwo.png" mode="" />
                 </view>
             </view>
-            <view class="menu-item" @click="serverchange()">
+            <!-- <view class="menu-item" @click="serverchange()">
                 <view class="meanLeft">
                     <image src="../../static/setting.png" mode="" />
                     <text>网络配置</text>
@@ -35,7 +35,7 @@
                 <view class="meanRight">
                     <image src="../../static/arrTwo.png" mode="" />
                 </view>
-            </view>
+            </view> -->
             <view class="menu-item" @click="deaAccount()">
                 <view class="meanLeft">
                     <image src="../../static/logoff.png" mode="" />