fix:修复不能获取设备编号错误

sample-form-client-ui/admin/src/App.vue

@@ -114,19 +114,20 @@ export default {
     getInfo() {
       let routeQuery = this.urlGet();
       if (JSON.stringify(routeQuery) !== "{}") {
-        let serveinfo = routeQuery["serveinfo"]
-          ? JSON.parse(decodeURIComponent(routeQuery["serveinfo"]))
-          : {};
         let { devicenum } = routeQuery;
-        let { deviceInfo, serviceInfo } = serveinfo;
-        let { serverUrl } = serviceInfo;
-        let siteId = deviceInfo.siteId; //站点id
         this.devicenum = devicenum;
-        local.setLocal("siteId", siteId);
-        local.setLocal("serverUrl", serverUrl);
-        local.setLocal("devicenum", devicenum);
-        local.setLocal("deviceInfo", deviceInfo);
         this.SET_deviceCode(devicenum);
+        local.setLocal("devicenum", devicenum);
+        // window软件测试
+        let serveinfo = JSON.parse(decodeURIComponent(routeQuery["serveinfo"]));
+        if (JSON.stringify(serveinfo) !== "{}") {
+          let { deviceInfo, serviceInfo } = serveinfo;
+          let { serverUrl } = serviceInfo;
+          let siteId = deviceInfo.siteId; //站点id
+          local.setLocal("siteId", siteId);
+          local.setLocal("serverUrl", serverUrl);
+          local.setLocal("deviceInfo", deviceInfo);
+        }
       }
     },
     // 获取首页信息

sample-form-client-ui/admin/src/mixin/mq.js

@@ -152,6 +152,7 @@ export default {
               },
               conditions
             );
+
             // 心跳上行消息
             _this.settimer = setInterval(() => {
               let beatObj = {
@@ -195,8 +196,6 @@ export default {
       let deviceInfo = objc.deviceInfo; //设备信息
       let serverUrl = serviceInfo.serverUrl; //系统地址
       let siteId = deviceInfo.siteId; //站点id
-      this.devicenum = objc.devicenum;
-      local.setLocal("devicenum", this.devicenum); // 设备编号
       // 保存地址
       local.setLocal("serverUrl", serverUrl);
       local.setLocal("siteId", siteId);