Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

Administrator

2021-04-26 0b56d5aa27788ae60de2d7bcb3f2fa131434c09e

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 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")