From be2983cb91e06554ff939c53b37284af1e1c170a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 May 2021 10:42:30 +0800
Subject: [PATCH] 地图，详情跳转，视频
---
src/views/dataL/dataL.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 9632beb..00e6aea 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -19,8 +19,8 @@
'l-t-s-yuan': true,
}"
></span>
-
- <span>{{' ' + state }}</span>
+
+ <span>{{ " " + state }}</span>
</div>
<div class="t-t-time">
<p>{{ ReportTime }}</p>
@@ -604,6 +604,8 @@
myChart: "",
numdatalist: [120, 132, 101, 134, 90, 230, 210, 120, 132, 0, 134, 0],
+ jingqingPdianji: null,
+
name: "",
state: "",
evaluate: "",
@@ -627,7 +629,7 @@
isRecord: true,
screens: false,
//复选框
- dataState: ["掉线", "在线", "故障", "预警"],
+ dataState: ["掉线", "正常", "故障", "预警"],
// [grey,green,red][
// onlineStatus = 0,
// onlineStatus = 1,
@@ -1030,7 +1032,7 @@
} else {
if (j != 1) {
if (o == 1) {
- states = "在线";
+ states = "正常";
} else {
states = "掉线";
}
@@ -1086,6 +1088,7 @@
var ds = res.data.data.records;
// console.log(ds)
this.setdataG(ds);
+ this.jingqingPdianji = ds;
});
},
setdataG(d) {
@@ -1125,6 +1128,7 @@
oneContacts: d[key].oneContacts,
alarmPeople: d[key].alarmPeople,
onePhone: d[key].onePhone,
+ jjTime: d[key].jjTime,
childs: [],
});
}
@@ -1197,7 +1201,15 @@
},
handleCurrentChange(val) {
//行点击事件
- // console.log(val.i);
+ var b = this.jingqingPdianji;
+ for (var key in b) {
+ if (b[key].jjTime == val.jjTime) {
+ // console.log(b[key]);
+ // this.$store.commit("SET_DATAL", this.a);
+ this.$router.push({ path: "/policeTracking/track", query: b[key] });
+ }
+ }
+ // console.log(this.$store.state)
},
//获取视频
openRealVideoBox(serialNumber, channelNumber) {
@@ -1264,10 +1276,16 @@
created() {
// let loadingInstance1 = Loading.service({ fullscreen: true });
// this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
- this.a = this.$route.query;
- // console.log(this.a);
+ // this.a = this.$route.query.deviceNumber == undefined? this.$store.state.dataL.dataLa : this.$route.query;
+ if(this.$route.query.deviceNumber == undefined){
+ this.a = this.$store.state.dataL.dataLa;
+ }else{
+ this.a = this.$route.query;
+ this.$store.commit("SET_DATAL", this.a);//每次都缓存在vuex中，如果没有从正确路径进来，则使用缓存
+ }
+ console.log(this.a);
this.baseUrl = `/map/index.html?ISinit=1&openid=DetailMap&jd=${this.a.jd}&wd=${this.a.wd}`;
- this.myDeviceNumber = this.$route.query.deviceNumber;
+ this.myDeviceNumber = this.a.deviceNumber;
// console.log(this.a);
// console.log(this.myDeviceNumber);
this.getdata();
@@ -1297,13 +1315,13 @@
if (this.activeName == "third") {
this.i++;
this.openRealVideoBox(this.a.serialNumber, this.a.channelNumber);
- }else{
+ } else {
var dom = document.getElementById("real_video_conversationDataL");
if (dom.getAttribute("src") != "") {
- dom.pause();
- dom.setAttribute("src", "");
- this.hls.destroy();
- }
+ dom.pause();
+ dom.setAttribute("src", "");
+ this.hls.destroy();
+ }
}
},
},
@@ -1719,6 +1737,6 @@
width: 50%;
}
video::-webkit-media-controls-timeline {
- display: none;
- }
+ display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3