diff --git a/sample-form-client-ui/admin/src/App.vue b/sample-form-client-ui/admin/src/App.vue index 81ae8450fd861f0099453e0cfce6b60c113c3cab..d2615848117e4b204493e76204ba3851f1bf039a 100644 --- a/sample-form-client-ui/admin/src/App.vue +++ b/sample-form-client-ui/admin/src/App.vue @@ -45,7 +45,7 @@ export default { }, serviceInfo: { homeUrl: "http://192.168.0.24:8080/#/", - serverUrl: "http://10.12.185.213:11098", + serverUrl: "http://192.168.0.98:11078", }, }; this.WebSocketMq(obj); diff --git a/sample-form-client-ui/admin/src/components/MateralsList.vue b/sample-form-client-ui/admin/src/components/MateralsList.vue index 30048f2b63e1d62e23d015f90217ffb97abeb466..e5f04b69a97d0ff1240e1ac5821e6f978e997d0e 100644 --- a/sample-form-client-ui/admin/src/components/MateralsList.vue +++ b/sample-form-client-ui/admin/src/components/MateralsList.vue @@ -69,7 +69,7 @@ export default { }, data() { return { - api: local.getLocal("baseUrl") + "/", + api: local.getLocal("serverUrl") + "/", row: 4, }; }, diff --git a/sample-form-client-ui/admin/src/mixin/mq.js b/sample-form-client-ui/admin/src/mixin/mq.js index 20a058ce9582988ce525a03bd03b3306b7b13e3d..9e95eb033db65787026ca20ecb020c54c79e4a70 100644 --- a/sample-form-client-ui/admin/src/mixin/mq.js +++ b/sample-form-client-ui/admin/src/mixin/mq.js @@ -192,9 +192,12 @@ export default { WebSocketMq(objc) { var obj = objc.rabbmitInfo; //mq淇℃伅 var serviceInfo = objc.serviceInfo; //鏈嶅姟鍣ㄤ俊鎭� + var deviceInfo = objc.deviceInfo; //璁惧淇℃伅 var serverUrl = serviceInfo.serverUrl; //绯荤粺鍦板潃 + var siteId = deviceInfo.siteId; //绔欑偣id // 淇濆瓨鍦板潃 local.setLocal("serverUrl", serverUrl); + local.setLocal("siteId", siteId); // 鍒濆鍖栨帴鍙� setTimeout(() => { // 鏌ヨ绔欑偣淇℃伅 diff --git a/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue b/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue index 483a8c4919e05db712a35b3a0096f5ed8bcac2c7..bfa5c3a14bb484c073eafddd2a5d8944052d43af 100644 --- a/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue +++ b/sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue @@ -109,9 +109,7 @@ export default { }, data() { return { - api: local.getLocal("baseUrl") - ? local.getLocal("baseUrl") + "/" - : "http://192.168.0.98:11078/", + api: local.getLocal("serverUrl"), matterInfo: this.$route.query, materailsList: [], active: 0,