Commit 78772afd authored by “yiyousong”'s avatar “yiyousong”

fix:修改产品id获取失败

parent 5bff9990
...@@ -27,3 +27,5 @@ yarn lint ...@@ -27,3 +27,5 @@ yarn lint
### Customize configuration ### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/). See [Configuration Reference](https://cli.vuejs.org/config/).
http://localhost:8081?v=409&serveinfo={"deviceInfo":{"enabled":1,"productId":10,"productName":"样表机","siteCode":"","siteId":1,"siteName":"","source":1},"rabbmitInfo":{"downTopicFilter":"/down/C0-FB-F9-CD-3B-A4","exchangeName":"phxt.pdj","host":"10.12.185.213","messageTtl":"86400000","password":"admin@2020","port":5672,"uploadTopicFilter":"/upload/C0-FB-F9-CD-3B-A4","username":"taxi_mq","virtualHost":"/test"},"serviceInfo":{"homeUrl":"","serverUrl":"http://192.168.0.98:11078/"}}&devicenum=18-93-7F-C0-AD-B5
...@@ -114,8 +114,16 @@ export default { ...@@ -114,8 +114,16 @@ export default {
getInfo() { getInfo() {
let routeQuery = this.urlGet(); let routeQuery = this.urlGet();
if (JSON.stringify(routeQuery) !== "{}") { if (JSON.stringify(routeQuery) !== "{}") {
let { devicenum, deviceInfo } = 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; this.devicenum = devicenum;
local.setLocal("siteId", siteId);
local.setLocal("serverUrl", serverUrl);
local.setLocal("devicenum", devicenum); local.setLocal("devicenum", devicenum);
local.setLocal("deviceInfo", deviceInfo); local.setLocal("deviceInfo", deviceInfo);
this.SET_deviceCode(devicenum); this.SET_deviceCode(devicenum);
......
...@@ -38,7 +38,6 @@ export default { ...@@ -38,7 +38,6 @@ export default {
justify-content: center; justify-content: center;
img { img {
width: 100%; width: 100%;
height: 100%;
} }
.content { .content {
display: flex; display: flex;
......
...@@ -195,11 +195,12 @@ export default { ...@@ -195,11 +195,12 @@ export default {
let deviceInfo = objc.deviceInfo; //设备信息 let deviceInfo = objc.deviceInfo; //设备信息
let serverUrl = serviceInfo.serverUrl; //系统地址 let serverUrl = serviceInfo.serverUrl; //系统地址
let siteId = deviceInfo.siteId; //站点id let siteId = deviceInfo.siteId; //站点id
// let devicenum = objc.devicenum; this.devicenum = objc.devicenum;
// local.setLocal("devicenum", devicenum); // 设备编号 local.setLocal("devicenum", this.devicenum); // 设备编号
// 保存地址 // 保存地址
local.setLocal("serverUrl", serverUrl); local.setLocal("serverUrl", serverUrl);
local.setLocal("siteId", siteId); local.setLocal("siteId", siteId);
local.setLocal("deviceInfo", deviceInfo);
// 初始化接口 // 初始化接口
setTimeout(() => { setTimeout(() => {
// 查询站点信息 // 查询站点信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment