diff --git a/config/dev.env.js b/config/dev.env.js index f56a0b7..f28e990 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.8.201:8083/smartwell"' + // BASE_API: '"http://192.168.8.201:8083/smartwell"' + BASE_API: '"http://139.198.0.132:20005/smartwell"' // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/config/dev.env.js b/config/dev.env.js index f56a0b7..f28e990 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.8.201:8083/smartwell"' + // BASE_API: '"http://192.168.8.201:8083/smartwell"' + BASE_API: '"http://139.198.0.132:20005/smartwell"' // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/src/api/group.js b/src/api/group.js index e0fa884..eb84667 100644 --- a/src/api/group.js +++ b/src/api/group.js @@ -80,7 +80,6 @@ } }) } - // 从组里删除井 export function delWellFromGroup(params) { return request({ diff --git a/config/dev.env.js b/config/dev.env.js index f56a0b7..f28e990 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,7 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.8.201:8083/smartwell"' + // BASE_API: '"http://192.168.8.201:8083/smartwell"' + BASE_API: '"http://139.198.0.132:20005/smartwell"' // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/src/api/group.js b/src/api/group.js index e0fa884..eb84667 100644 --- a/src/api/group.js +++ b/src/api/group.js @@ -80,7 +80,6 @@ } }) } - // 从组里删除井 export function delWellFromGroup(params) { return request({ diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 335e974..d65b0ef 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -433,7 +433,7 @@ // 获取token保存到vuex中的用户信息,此处仅适用于本项目,注意删除或修改 // 实例化socket,这里我把用户名传给了后台,使后台能判断要把消息发给哪个用户,其实也可以后台直接获取用户IP来判断并推送 // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username - const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username + const socketUrl = 'ws://139.198.0.132:20008/army/webSocket/' + this.$store.getters.username // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username console.log(socketUrl) this.socket = new WebSocket(socketUrl) @@ -651,7 +651,7 @@ isAlarm: '1' // 报警状态 } getWellList(listQuery).then(response => { - // this.loading = false + this.loading = false if (response.code === 200) { const wells = response.data if (wells.length > 0) {