南昌市物联网技防平台-前端
zengh
2021-04-26 7ec8398309901760cec55bb688c8554261261d20
Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 Conflicts:
 src/page/index/logo.vue
1 files modified
11 ■■■■■ changed files
src/page/index/logo.vue 11 ●●●●● patch | view | raw | blame | history
src/page/index/logo.vue
@@ -375,8 +375,11 @@
      // 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")
@@ -808,10 +811,10 @@
      }
      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)