From ace8365895a2dd18b6633d2ee38600d44629f644 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Tue, 18 Jun 2024 17:39:56 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                            | 6 +++---
 src/views/projectFront/laborManage/rosterNew.vue | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index f12c1aad..5baadfa2 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -178,15 +178,15 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
     // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
     // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
-    axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+    // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
     // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
     // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
     // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
     // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
     // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-    // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
-    // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
+    axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+        // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
 } else if (process.env.NODE_ENV == "debug") {
     axios.defaults.baseURL = "https://www.ceshi.com";
 } else if (process.env.NODE_ENV == "production") {
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index 2224788b..9e416868 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -1142,6 +1142,8 @@ export default {
       },
       whoId: "",
       isIscDevice: false,
+      topicName: "topic",
+      userId: "",
     };
   },
   computed: {
@@ -1181,6 +1183,8 @@ export default {
     this.getConfig();
   },
   mounted() {
+    this.userId = this.$store.state.userInfo.userId;
+    this.topicName = this.$store.state.userInfo.scope;
     client = mqtt.connect(mqttUrl, options);
     this.mqttMSG();
   },
@@ -1200,7 +1204,7 @@ export default {
       });
       // 接收消息处理
       client.on("message", (topic, message) => {
-        // console.log(message);
+        console.log(message);
         this.getInfoList();
       });
       // 断开发起重连