From 0b56d5aa27788ae60de2d7bcb3f2fa131434c09e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 09:36:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/page/index/logo.vue | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 6216cf7..2e3c4ea 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -374,43 +374,46 @@
// window.clearTimeout(window.realTimeQuery);
// that.deviceId = 334; // 测试用
// window.realTimeQuery = setInterval(function () {
- axios({
- url: "/api/blade-jfpts/alarm/alarm/selecttx?id=" + jid,
- method: "post",
- }).then(function (response) {
- var userId = JSON.parse(
- window.localStorage.getItem("物联网安保云服务平台-userInfo")
- ).content.user_id;
+ axios({
+ url: "/api/blade-jfpts/alarm/alarm/page",
+ method: "get",
+ params: {
+ id: jid,
+ },
+ }).then(function (response) {
+ var userId = JSON.parse(
+ window.localStorage.getItem("物联网安保云服务平台-userInfo")
+ ).content.user_id;
- if (response.data.data.length > 0) {
- // that.deviceId = response.data.data[0].id;
- that.form = response.data.data[0];
+ if (response.data.data.length > 0) {
+ // that.deviceId = response.data.data[0].id;
+ that.form = response.data.data[0];
- if (
- response.data.data[0].waringType == "紧急求救" &&
- response.data.data[0].alarmId == userId
- ) {
- response.data.data[0].waringType = "一键求助";
+ if (
+ response.data.data[0].waringType == "紧急求救" &&
+ response.data.data[0].alarmId == userId
+ ) {
+ response.data.data[0].waringType = "一键求助";
- that.peopleList = [
- { label: that.form.oneContacts, value: that.form.onePhone },
- { label: that.form.twoContacts, value: that.form.twoPhone },
- { label: that.form.threeContacts, value: that.form.threePhone },
- ];
- that.peopleName = that.form.oneContacts;
- that.peoplePhone = that.form.onePhone;
- that.dialogTableVisible = true;
+ that.peopleList = [
+ { label: that.form.oneContacts, value: that.form.onePhone },
+ { label: that.form.twoContacts, value: that.form.twoPhone },
+ { label: that.form.threeContacts, value: that.form.threePhone },
+ ];
+ that.peopleName = that.form.oneContacts;
+ that.peoplePhone = that.form.onePhone;
+ that.dialogTableVisible = true;
- that.ofX = null;
- that.ofY = null;
+ that.ofX = null;
+ that.ofY = null;
- window.addEventListener("mousemove", that.handleMousemove);
+ window.addEventListener("mousemove", that.handleMousemove);
- that.$refs.realAudio.src = "./realVideo/audio.mp3";
- that.$refs.realAudio.play();
- }
+ that.$refs.realAudio.src = "./realVideo/audio.mp3";
+ that.$refs.realAudio.play();
}
- });
+ }
+ });
// }, 5000);
},
closeDialog() {
@@ -811,7 +814,7 @@
//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)
--
Gitblit v1.9.3