dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

100J功能部分功能修改

Browse Source
This commit is contained in:
fengerli
2026-02-06 13:42:22 +08:00
parent 1fc02b5f5a
commit 7d657d4429
3 changed files with 230 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
pages/100J/HBY100-J.vue
View File

@ -43,26 +43,26 @@
<text class="value">{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus
=== 2 ? '故障' : '在线' }}</text>
</view>
<view class="item">
<text class="lbl">定位信息</text>
<view class="info-value">
<view class="value" @click="gpsPosition(deviceInfo)">
{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
</view>
<view class="locationGPS">
<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
style="vertical-align: bottom;" />
{{ deviceInfo.address }}
</view>
<view class="info-row">
<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
<view class="info-value status-running">
{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
</view>
</view>
<view class="info-value status-running locationGPS">
<uni-icons type="location" size="17"
color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
{{ deviceInfo.address }}
</view>
</view>
</view>
</view>
<view class="lampMode">
<view class="sosContent">
<view class="btnSos openSos center" :class="{ active: formData.sta_SOSType === 1 }"
@click="sosSetting(1)">
{{ deviceInfo.chargeState === 1 ? '报警中' : '强制报警' }}
{{ deviceInfo.voiceStrobeAlarm === 1 ? '报警中' : '强制报警' }}
</view>
<view class="btnSos closeSos center" @click="sosSetting(0)">解除</view>
</view>
@ -80,7 +80,7 @@
<view class="arrow" @click.stop="openVolume(item, index)" v-if="item.show"
v-for="item, index in dic.sta_VoiceType" :class="{
'active': formData.sta_VoiceType === item.key,
'displayNone': !Status.usrToggle && index > 3
'displayNone': !Status.usrToggle && index > 2
}">
<view class="outCircle">
<view class="item">
@ -148,32 +148,32 @@
</view>
<view class="header paddingTop0">
<text class="sliderTxt">亮度</text>
<text class="sliderVal">{{ formData.sta_LightDimmer }}%</text>
<text class="sliderVal">{{ formData.lightBrightness }}%</text>
</view>
<view class="slider-container">
<slider min="10" max="100" step="10" :disabled="false" :value="formData.sta_LightDimmer"
<slider min="10" max="100" step="10" :disabled="false" :value="formData.lightBrightness"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onBrightnessChanging" @changing="onBrightnessChanging" class="custom-slider" />
</view>
<view class="line"></view>
<view class="header paddingTop0">
<text class="sliderTxt">频率</text>
<text class="sliderVal">{{ formData.sta_LightFreq }}HZ</text>
<text class="sliderVal">{{ formData.strobeFrequency }}HZ</text>
</view>
<view class="slider-container">
<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.sta_LightFreq"
<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.strobeFrequency"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onFreqChanging" @changing="onFreqChanging" class="custom-slider" />
</view>
<view class="line"></view>
<view class="header paddingTop0">
<text class="sliderTxt">音量</text>
<text class="sliderVal">{{ formData.sta_VoiceVolume }}</text>
<text class="sliderVal">{{ formData.volume }}</text>
</view>
<view class="slider-container">
<slider min="1" max="8" step="1" :disabled="false" :value="formData.sta_VoiceVolume"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" />
<slider min="10" max="100" step="1" :disabled="false" :value="formData.volume" activeColor="#bbe600"
backgroundColor="#686767" block-size="20" block-color="#ffffffde" @change="onVolumeChanging"
@changing="onVolumeChanging" class="custom-slider" />
</view>
<view class="proinfo lamp">
<text class="title">产品信息</text>
@ -211,6 +211,7 @@
<script>
import gbk from '@/utils/gbk.js'
import MqttClient from '@/utils/mqtt.js';
import {
showLoading,
hideLoading,
@ -234,6 +235,7 @@
export default {
data() {
return {
mqttClient: null,
Status: {
isRightIconVisible: false,
navTitle: '',
@ -304,10 +306,10 @@
bleStatu: false,
sta_address: '',
sta_VoiceType: '0',
sta_VoiceVolume: 1,
volume: 10,
sta_LightType: '',
sta_LightFreq: 0.5,
sta_LightDimmer: 10,
strobeFrequency: 0.5,
lightBrightness: 10,
sta_system: '',
warnTime: 0,
sta_SOSType: 0
@ -363,7 +365,7 @@
sta_LightType: [{
key: "6",
name: '红蓝',
name: '红蓝交替',
show: true
},
{
@ -383,17 +385,17 @@
},
{
key: "3",
name: '红流水',
name: '红色顺时针',
show: true
},
{
key: "4",
name: '黄流水',
name: '黄色顺时针',
show: true
},
{
key: "5",
name: '蓝流水',
name: '红蓝顺时针',
show: true
},
{
@ -450,6 +452,7 @@
these.Status.navTitle = data.data.deviceName;
these.Status.apiType = data.apiType;
these.Status.isRightIconVisible = these.Status.apiType === 'listA';
if (data.apiType !== 'listA') {
Common.getdeviceShareId(data.data.id).then(res => {
if (res.code == 200) {
@ -460,6 +463,20 @@
});
}
this.mqttClient = new MqttClient();
this.mqttClient.connect(() => {
// 订阅来自设备的状态更新
const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
this.mqttClient.subscribe(statusTopic, (payload) => {
try {
// 解析MQTT返回的payload
const payloadObj = typeof payload === 'string' ? JSON.parse(
payload) : payload;
} catch (e) {
}
})
})
console.log(data, 'datatatatat');
these.fetchDeviceDetail(data.data.id)
});
@ -487,7 +504,24 @@
fetchDeviceDetail(id) {
deviceDetail(id).then((res) => {
if (res.code == 200) {
this.deviceInfo = res.data
const validData = Object.fromEntries(
Object.entries(res.data).filter(([key, value]) => {
// 过滤规则：值为 null/undefined/0 的字段都不参与合并
return value !== null && value !== undefined && value !== 0;
})
);
Object.assign(this.formData, validData);
this.deviceInfo = res.data;
// 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
this.formData.sta_LightType = (res.data.strobeMode ?? 0) + ''
// 0爆闪关闭, 1爆闪开启
const strobeEnable = res.data.strobeEnable ?? 0;
this.formData.sta_LightType = strobeEnable === 1 ? 1 : -1;
if (res.data.alarmMode == 7) {
this.formData.sta_VoiceType = res.data.voiceStrobeAlarm ?? 0;
} else {
this.formData.sta_VoiceType = res.data.alarmMode + ''
}
}
})
},
@ -519,6 +553,7 @@
},
// 语音管理
audioManager(item) {
this.formData.sta_VoiceType = -1
if (this.Status.apiType !== 'listA') {}
uni.navigateTo({
url: '/pages/100J/audioManager/AudioList',
@ -533,18 +568,18 @@
},
//频率
onFreqChanging(e) {
this.formData.sta_LightFreq = e.detail.value;
this.formData.strobeFrequency = e.detail.value;
this.throttledFreqChange(e.detail.value);
},
//音量
onVolumeChanging(e) {
this.formData.sta_VoiceVolume = e.detail.value;
this.formData.volume = e.detail.value;
this.throttledVolumeChange(e.detail.value);
},
// 亮度调节
onBrightnessChanging(e) {
this.formData.sta_LightDimmer = e.detail.value;
this.formData.lightBrightness = e.detail.value;
this.throttledBrightnessChange(e.detail.value);
},
// 亮度调节
@ -698,7 +733,7 @@
this.formData.sta_VoiceType = val;
console.log(this.formData.sta_VoiceType, 'this.formData.sta_VoiceType')
// 模式类型为7时才去判断
if (val == '7') {
if (val === '7' || val === '-1') {
let data = {
deviceId: this.deviceInfo.deviceId,
voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
@ -969,14 +1004,14 @@
border-radius: 16rpx;
background: rgba(26, 26, 26, 1);
box-sizing: border-box;
padding: 15rpx 0rpx 40rpx 0rpx;
padding: 15rpx 30rpx;
}
.eqinfo .item {
width: 100%;
height: 60rpx;
line-height: 60rpx;
padding: 0rpx 28rpx;
/* padding: 0rpx 28rpx; */
box-sizing: border-box;
display: flex;
flex-direction: row;
@ -1006,12 +1041,12 @@
}
.eqinfo .info-value {
margin-top: 30rpx;
/* margin-top: 30rpx; */
}
.eqinfo .status-running {
/* .eqinfo .status-running {
color: rgba(174, 214, 0, 1);
}
} */
.lamp {
margin-top: 24rpx;
@ -1714,4 +1749,32 @@
width: 100%;
font-size: 32rpx;
}
.info-row {
display: flex;
justify-content: space-between;
}
.info-label {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.87);
white-space: nowrap;
}
.info-value {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.6);
}
.status-running {
/* color: rgba(255, 255, 255, 0.6); */
text-align: end;
}
.locationGPS {
width: 88%;
text-align: end;
float: right;
line-height: 45rpx;
font-size: 28rpx;
}
</style>