|
@@ -94,6 +94,33 @@
|
|
|
}}</text>
|
|
|
<image src="../../static/rightArrow.png"></image>
|
|
|
</view>
|
|
|
+ <view
|
|
|
+ class="title"
|
|
|
+ v-if="
|
|
|
+ devInfo.installPosition == 'Bedroom' ||
|
|
|
+ (breathRate === 0 && breathRate !== '')
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="title-text"
|
|
|
+ style="color: #111111; font-size: 30rpx"
|
|
|
+ >当前呼吸率</view
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="title-btn"
|
|
|
+ style="color: #111111; font-size: 30rpx"
|
|
|
+ v-if="breathRate !== ''"
|
|
|
+ >{{ breathRate }}次/分钟</view
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ v-else
|
|
|
+ class="title-btn"
|
|
|
+ style="color: #111111; font-size: 30rpx"
|
|
|
+ >
|
|
|
+ 暂无
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
<view class="title" v-if="devInfo.installPosition == 'Toilet'">
|
|
|
<view class="title-text" style="color: #22dea7"
|
|
|
>今日卫生间使用频次</view
|
|
@@ -266,6 +293,7 @@
|
|
|
v-if="isInitAlarm"
|
|
|
:clientIdProp="clientIdProp"
|
|
|
@sendChange="receptionChange"
|
|
|
+ @sendHealth="receptHealth"
|
|
|
/>
|
|
|
</view>
|
|
|
</template>
|
|
@@ -308,20 +336,15 @@ export default {
|
|
|
messageFlag: true,
|
|
|
serviceNumberFlag: true,
|
|
|
voipFlag: true,
|
|
|
- inactivityTimer: "",
|
|
|
isInitAlarm: "",
|
|
|
|
|
|
// mqtt模块
|
|
|
- mqttClient: null,
|
|
|
targetPoints: {},
|
|
|
inactivityTimer: null,
|
|
|
- reconnectTimer: null,
|
|
|
- reconnectCount: 0,
|
|
|
- maxReconnectAttempts: 5,
|
|
|
- isConnecting: false,
|
|
|
left: 0,
|
|
|
top: 0,
|
|
|
clientIdProp: null,
|
|
|
+ breathRate: "",
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
@@ -637,6 +660,9 @@ export default {
|
|
|
receptionChange(val) {
|
|
|
this.targetPoints = val;
|
|
|
},
|
|
|
+ receptHealth(val) {
|
|
|
+ this.breathRate = val;
|
|
|
+ },
|
|
|
getToday() {
|
|
|
const today = new Date();
|
|
|
const year = today.getFullYear();
|