liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

650/670增加关闭探测功能，删除一些跟供应商调试的页面

Browse Source
This commit is contained in:
liub
2025-09-23 08:36:21 +08:00
parent 1cd9853f2f
commit 50373f407d
21 changed files with 125 additions and 15890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
pages/670/HBY670.vue
View File

@ -27,31 +27,32 @@
<view class="eqinfo">
<view class="item">
<text class="lbl">设备IMEI</text>
<text class="value">{{device.deviceImei}}</text>
<text class="value valueFont">{{device.deviceImei}}</text>
</view>
<view class="item">
<text class="lbl">设备名称</text>
<text class="value">{{device.deviceName}}</text>
<text class="value valueFont">{{device.deviceName}}</text>
</view>
<view class="item">
<text class="lbl">设备状态</text>
<text class="value">{{formData.sta_system}}</text>
<text class="value valueFont">{{formData.sta_system}}</text>
</view>
<view class="item">
<text class="lbl">定位信息</text>
<view class="multiValue">
<view class="valueItem">
<view class="valueItem valueFont">
{{formData.Lon}}
</view>
<view class="valueItem">
<view class="valueItem valueFont">
{{formData.Lat}}
</view>
<view class="valueItem">
<view style="width:80%;float: right;text-align: right;">{{formData.address}}</view>
<view style="width:80%;float: right;text-align: right;" class="valueFont">{{formData.address}}
</view>
<view class="clear"></view>
</view>
</view>
@ -95,6 +96,10 @@
@click="GearSetting('hight','staticBattery')">
<view class="p100 center">高档</view>
</view>
<view class="item " :class="formData.modeCurr=='close'?'active':''"
@click="GearSetting('close','staticBattery')">
<view class="p100 center">关闭</view>
</view>
</view>
<view class="optTitle">
@ -316,7 +321,7 @@
promptTitle: '设备名称',
modelValue: '',
visibleClose: false,
okCallback: null
},
BottomMenu: {
show: false,
@ -481,8 +486,8 @@
if (res && res.code == 200) {
res = res.data;
let json=res;
console.log("res=",res);
let json = res;
console.log("res=", res);
that.formData.Lon = res.longitude;
that.formData.Lat = res.latitude;
that.formData.address = res.address;
@ -493,17 +498,17 @@
that.formData.job = personnelInfo.position;
that.formData.usrid = personnelInfo.code
}
let dic = {
"3": "hight",
"2": "center",
"1": "low",
"0": "close",
};
let staticLevelText = dic[json.staDetectGrade];
that.formData.modeCurr = staticLevelText;
let dic = {
"3": "hight",
"2": "center",
"1": "low",
"0": "close",
};
let staticLevelText = dic[json.staDetectGrade];
that.formData.modeCurr = staticLevelText;
dic = {
"0": "none",
"1": "ruo",
@ -513,14 +518,15 @@
};
let warn = dic[json.staDetectResult];
that.formData.warnLevel = warn;
let lightingLevelText = json.staLightGrade === 1 ? 'hight' : json.staLightGrade === 2 ? 'low' :
let lightingLevelText = json.staLightGrade === 1 ? 'hight' : json.staLightGrade === 2 ?
'low' :
'close';
that.formData.lightCurr = lightingLevelText;
that.formData.battary = json.staPowerPercent
let hours = Math.floor(json.staPowerTime / 60);
let remainingMinutes = json.staPowerTime % 60;
let xuhang = '0分';
@ -532,13 +538,13 @@
} else {
xuhang = `${hours}小时${remainingMinutes}分`;
}
that.formData.xuhang = xuhang;
let sosText = json.staSOSGrade === 2 ? 'rb' : json.staSOSGrade === 1 ? "sg" : "close";
that.formData.SOS = sosText;
}
});
},
@ -1009,7 +1015,12 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: "解除报警",
okCallback: callback,
okCallback: () => {
if (callback) {
callback();
}
this.Status.Pop.okCallback = null;
},
clickEvt: 'time'
});
},
@ -1097,7 +1108,7 @@
let OpenSOS = () => {
these.formData.qzwarn = true; //标记为强制报警了
these.Status.staticWarn.time = 50;
these.Status.staticWarn.time = 180;
this.formData.SOS = type;
let loopFunc = () => {
@ -1121,21 +1132,34 @@
console.log("111111");
this.showQzWarn(this.Status.Pop.okCallback);
}
}
these.Status.staticWarn.inteval = setInterval(() => {
loopFunc();
}, 1000)
}, 1000);
bleSendCmd();
}
if (type == 'rb') { //红蓝报警
this.formData.SOS = type;
bleSendCmd();
return;
}
if (type == 'sg') //强制报警
console.log("11111");
let sendRb = () => {
this.formData.SOS = type;
bleSendCmd();
these.formData.qzwarn=false;
this.Status.staticWarn.time=0;
return;
}
if (these.formData.qzwarn) {
console.log("222222");
these.showQzWarn(sendRb);
} else {
sendRb();
}
} else if (type == 'sg') //强制报警
{
this.showPop({
@ -1147,8 +1171,7 @@
buttonText: "开启"
});
return;
}
if (type == 'close') {
} else if (type == 'close') {
if (this.formData.SOS = 'sg') { //解除声光报警
this.CloseWarn(true);
@ -1178,7 +1201,7 @@
hight: 0x65,
center: 0x66,
low: 0x67,
close: 0x68
close: 0x64
},
mqtt: {
hight: 3,
@ -2324,14 +2347,22 @@
.eqinfo .value {
color: rgba(255, 255, 255, 0.6);
font-family: PingFang SC;
font-size: 28rpx;
font-family: 'PingFang SC';
font-size: 28rpx !important;
font-weight: 400;
letter-spacing: 0.07px;
text-align: left;
}
.eqinfo .valueFont {
font-family: 'PingFang SC';
font-size: 28rpx !important;
font-weight: 400;
color: rgba(255, 255, 255, 0.6);
}
.eqinfo .multiValue {
display: flex;
flex-direction: column;