diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue index e015d3df..d97e04d8 100644 --- a/vue/src/views/index.vue +++ b/vue/src/views/index.vue @@ -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 + "
"; htmlStr += "固件版本: Version " + params.data.firmwareVersion + "
"; htmlStr += "激活时间: " + params.data.activeTime + "
"; + htmlStr += "定位方式: "; + if (params.data.locationWay == 1) { + htmlStr += "自动定位" + "
"; + } else if (params.data.locationWay == 2) { + htmlStr += "设备定位" + "
"; + } else if (params.data.locationWay == 3) { + htmlStr += "自定义位置" + "
"; + } else{ + htmlStr += "未知" + "
"; + } htmlStr += "所在地址: " + params.data.networkAddress + "
"; htmlStr += ''; return htmlStr; diff --git a/vue/src/views/iot/device/device-timer.vue b/vue/src/views/iot/device/device-timer.vue index 3faeb7a1..64ae37f1 100644 --- a/vue/src/views/iot/device/device-timer.vue +++ b/vue/src/views/iot/device/device-timer.vue @@ -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; },