修复首页蓝牙连接断开时更新状态，修复670 SOS报警时红色提示

pages/670/HBY670.vue

@@ -90,10 +90,10 @@
 				<view :class="getWarnStyle(5)" class="net netfive"></view>
 			</view>
 		</view>
-		<view class="warnnig" :class="(formData.qzwarn && Status.staticWarn.time)?'':'displayNone'"
+		<view class="warnnig" :class="formData.qzwarn ?'':'displayNone'"
 			@click="CloseWarn(true)">
 			<view>设备强制报警中！</view>
-			<view class="netContent">
+			<view class="netContent" :class="{'displayNone':!Status.staticWarn.time}">
 				{{Status.staticWarn.time}}s
 			</view>
 		</view>
@@ -890,7 +890,7 @@
 
 
 							} catch (error) {
-								console.log("无法解析此消息", error);
+								console.error("无法解析此消息", payload);
 							}
 						});
 						resolve();
@@ -973,6 +973,9 @@
 				if ("sta_SOSGrade" in json) {
 					let sosText = json.sta_SOSGrade === 2 ? 'rb' : json.sta_SOSGrade === 1 ? "sg" : "close";
 					receiveData.SOS = sosText;
+				
+						receiveData.qzwarn=sosText==='sg';
+					
 				}
 
 				if ("sta_ShakeBit" in json) {
@@ -1056,9 +1059,16 @@
 				if (this.formData.imei) {
 					this.initMQ();
 				}
+				let msgs=[];
+				if(this.formData.qzwarn){
+					msgs.push("设备强制报警中");
+				}
 				if (this.formData.staticWarn) { //有静止报警
+					msgs.push("设备静止报警中");
+				}
+				if(msgs.length>0){
 					this.showPop({
-						message: "设备静止报警中",
+						message: msgs.join(";"),
 						iconUrl: "/static/images/6155/DeviceDetail/warnning.png",
 						borderColor: "#e034344d",
 						buttonBgColor: "#E03434",
@@ -1066,6 +1076,7 @@
 						clickEvt: "staticWarn"
 					});
 				}
+				
 
 				this.setBleFormData();
 			},