|
|
@@ -184,11 +184,11 @@ export default {
|
|
|
extinguishingKeyPoints:[],
|
|
|
deptId:"",
|
|
|
saoCodeType:false,
|
|
|
-
|
|
|
+
|
|
|
countdown: '', //倒计时
|
|
|
timer2: null, //倒计时
|
|
|
dialogVisible: false, //一键灭火弹出层
|
|
|
-
|
|
|
+
|
|
|
conductCountdown: '',
|
|
|
timer3: null, //倒计时
|
|
|
outfireEnd: false, //灭火结束状态
|
|
|
@@ -303,13 +303,13 @@ export default {
|
|
|
//一键灭火-是否正在执行灭火操作
|
|
|
getApp().watch(this.getMqttPerformData,'mqttPerformData')
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
//一键灭火-查询设备状态
|
|
|
async firedeviceStatus() {
|
|
|
let _this = this;
|
|
|
-
|
|
|
+
|
|
|
const {data} = await firedeviceStatus(_this.subId)
|
|
|
if (data.code == 200) {
|
|
|
if(data.data.isexist){//是否有灭火设备
|
|
|
@@ -354,7 +354,7 @@ export default {
|
|
|
_this.$set(this,'fireListType',data.data.online);
|
|
|
_this.countdown = data.data.waitTime;//灭火倒计时
|
|
|
_this.sendCode() //倒计时
|
|
|
-
|
|
|
+
|
|
|
} else {
|
|
|
wx.showToast({
|
|
|
title: '一键灭火启动失败!',
|
|
|
@@ -387,13 +387,13 @@ export default {
|
|
|
success: function(res) {
|
|
|
if (res.confirm) {
|
|
|
_this.firedeviceStart(); //启动灭火设备
|
|
|
-
|
|
|
+
|
|
|
} else if (res.cancel) {
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
//一键灭火弹出层关闭
|
|
|
dialogOutfire() {
|
|
|
@@ -428,7 +428,7 @@ export default {
|
|
|
clearInterval(this.timer2);
|
|
|
this.timer2 = null;
|
|
|
this.dialogVisible = false;
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
//进行中倒计时
|
|
|
sendCode2(time) {
|
|
|
@@ -437,11 +437,11 @@ export default {
|
|
|
_this.loading2(); //启动定时器
|
|
|
_this.timer3 = setInterval(() => {
|
|
|
//创建定时器
|
|
|
- if (_this.conductCountdown === 1) {
|
|
|
+ if (_this.conductCountdown <= 1) {
|
|
|
_this.clearTimer2(); //关闭定时器
|
|
|
_this.outfireEnd = true; //灭火倒计时结束
|
|
|
_this.fireStartType = false; //灭火状态
|
|
|
-
|
|
|
+
|
|
|
console.log()
|
|
|
} else {
|
|
|
_this.loading2();
|
|
|
@@ -809,7 +809,7 @@ export default {
|
|
|
getApp().deleteOnlineData();
|
|
|
//删除一键灭火-是否正在执行灭火
|
|
|
getApp().deletePerformData();
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
beforeDestroy(){
|
|
|
// //删除传感器监听
|
|
|
@@ -842,12 +842,12 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
-
|
|
|
+
|
|
|
.outfire_li {
|
|
|
display: flex;
|
|
|
justify-content: flex-start;
|
|
|
//align-items: center;
|
|
|
-
|
|
|
+
|
|
|
>img {
|
|
|
width: 24rpx;
|
|
|
height: 30rpx;
|
|
|
@@ -857,14 +857,14 @@ export default {
|
|
|
.finish{
|
|
|
flex: 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.normal {
|
|
|
font-size: 24rpx;
|
|
|
font-family: PingFang SC;
|
|
|
font-weight: 500;
|
|
|
color: #333333;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.abnormal {
|
|
|
font-size: 24rpx;
|
|
|
font-family: PingFang SC;
|
|
|
@@ -872,7 +872,7 @@ export default {
|
|
|
color: #F11C00;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.outfire_li:nth-of-type(1) {
|
|
|
>img {
|
|
|
width: 30rpx;
|
|
|
@@ -880,7 +880,7 @@ export default {
|
|
|
margin-right: 12rpx;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.outfire_yes_btn {
|
|
|
width: 120rpx;
|
|
|
height: 40rpx;
|
|
|
@@ -894,7 +894,7 @@ export default {
|
|
|
text-align: center;
|
|
|
margin-left: 54rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.outfire_no_btn {
|
|
|
width: 120rpx;
|
|
|
height: 40rpx;
|
|
|
@@ -918,7 +918,7 @@ export default {
|
|
|
flex-direction: column;
|
|
|
z-index: 10;
|
|
|
background: rgba(0, 0, 0, 0.2);
|
|
|
-
|
|
|
+
|
|
|
.null-box {
|
|
|
flex: 1;
|
|
|
}
|
|
|
@@ -930,13 +930,13 @@ export default {
|
|
|
position: absolute;
|
|
|
top: 370rpx;
|
|
|
left: 62rpx;
|
|
|
-
|
|
|
+
|
|
|
.shade-outfire-n-t {
|
|
|
width: 172rpx;
|
|
|
height: 172rpx;
|
|
|
margin: 38rpx 0 0 226rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.shade-outfire-n-m {
|
|
|
font-size: 30rpx;
|
|
|
font-family: PingFang SC;
|
|
|
@@ -945,12 +945,12 @@ export default {
|
|
|
line-height: 84rpx;
|
|
|
text-align: center;
|
|
|
border-bottom: 1px solid #E0E0E0;
|
|
|
-
|
|
|
+
|
|
|
>text {
|
|
|
font-size: 40rpx;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.shade-outfire-n-b {
|
|
|
width: 402rpx;
|
|
|
height: 82rpx;
|
heyang