diff --git a/sample-form-client-ui/admin/src/App.vue b/sample-form-client-ui/admin/src/App.vue index a612e77f3989ad9950b06b7c2af641de9e83c2e4..3bcb7231e0fec2bf664743858abf59e8b33bd55d 100644 --- a/sample-form-client-ui/admin/src/App.vue +++ b/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); + } } }, // 鑾峰彇棣栭〉淇℃伅 diff --git a/sample-form-client-ui/admin/src/mixin/mq.js b/sample-form-client-ui/admin/src/mixin/mq.js index 640cde3c78aa3b8708df7da011213d1ce3c4cc92..87a4f1f2ba9a6787fe9c83d5876f0366450a0cc8 100644 --- a/sample-form-client-ui/admin/src/mixin/mq.js +++ b/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);