code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

首页地图显示定位方式，设备定时的时间排序

Browse Source
This commit is contained in:
kerwincui
2022-06-27 00:57:50 +08:00
parent 796468d123
commit a1c9ef99ad
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vue/src/views/index.vue
View File

@@ -552,6 +552,7 @@ export default {
activeTime: data[i].activeTime == null ? '' : data[i].activeTime,
deviceId: data[i].deviceId,
serialNumber: data[i].serialNumber,
locationWay:data[i].locationWay,
});
}
}
@@ -595,6 +596,16 @@ export default {
htmlStr += "产品名称： " + params.data.productName + "<br />";
htmlStr += "固件版本： Version " + params.data.firmwareVersion + "<br />";
htmlStr += "激活时间： " + params.data.activeTime + "<br />";
htmlStr += "定位方式： ";
if (params.data.locationWay == 1) {
htmlStr += "自动定位" + "<br />";
} else if (params.data.locationWay == 2) {
htmlStr += "设备定位" + "<br />";
} else if (params.data.locationWay == 3) {
htmlStr += "自定义位置" + "<br />";
} else{
htmlStr += "未知" + "<br />";
}
htmlStr += "所在地址： " + params.data.networkAddress + "<br />";
htmlStr += '</div>';
return htmlStr;

2
vue/src/views/iot/device/device-timer.vue
View File

@@ -651,7 +651,7 @@ export default {
}
let week = "*";
if (this.timerWeekValue.length > 0) {
week = this.timerWeekValue;
week = this.timerWeekValue.sort();
}
this.form.cronExpression = "0 " + minute + " " + hour + " ? * " + week;
},