From a1c9ef99ad2a221913a299bca8ee530f5fd6e8eb Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Mon, 27 Jun 2022 00:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9C=B0=E5=9B=BE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=9A=E4=BD=8D=E6=96=B9=E5=BC=8F=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AE=9A=E6=97=B6=E7=9A=84=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/index.vue                   | 11 +++++++++++
 vue/src/views/iot/device/device-timer.vue |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 + "<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;
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;
         },