Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
Conflicts:
src/page/index/logo.vue
| | |
| | | // that.deviceId = 334; // 测试用 |
| | | // window.realTimeQuery = setInterval(function () { |
| | | axios({ |
| | | url: "/api/blade-jfpts/alarm/alarm/selecttx?id=" + jid, |
| | | method: "post", |
| | | url: "/api/blade-jfpts/alarm/alarm/page", |
| | | method: "get", |
| | | params: { |
| | | id: jid, |
| | | }, |
| | | }).then(function (response) { |
| | | var userId = JSON.parse( |
| | | window.localStorage.getItem("物联网安保云服务平台-userInfo") |
| | |
| | | } |
| | | if (window.WebSocket) { |
| | | // https |
| | | window.socket = new WebSocket("wss://web.byisf.com/wss/websocket/"); |
| | | //window.socket = new WebSocket("wss://web.byisf.com/wss/websocket/"); |
| | | |
| | | //http |
| | | //window.socket = new WebSocket("ws://localhost:9034/websocket"); |
| | | window.socket = new WebSocket("ws://localhost:9034/websocket"); |
| | | |
| | | window.socket.onmessage = function (event) { |
| | | // alert(event.data) |