From 08ab2073c9e965c2ea1eb3e8d0a2cfc9a30d7d25 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 08 May 2021 15:18:39 +0800
Subject: [PATCH] https调整
---
src/views/dataL/dataL.vue | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 46 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 9632beb..bfba118 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>
@@ -165,7 +165,7 @@
</template>
</el-table-column>
<!-- <el-table-column label="跳转实时" prop="">
-
+
</el-table-column> -->
</el-table>
</div>
@@ -201,7 +201,7 @@
prop="open">
</el-table-column>
</el-table>
- </el-form>
+ </el-form>
</template>
</el-table-column>
<el-table-column
@@ -326,7 +326,7 @@
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="负责人">
+ <el-form-item label="主要负责人">
<el-input
disabled="true"
v-model="detailsData.person"
@@ -352,7 +352,7 @@
v-model="detailsData.user"
autocomplete="off"
></el-input>
- </el-form-item>
+ </el-form-item>
</el-col> -->
<el-col span="12">
<el-form-item label="序列号">
@@ -506,12 +506,12 @@
<!-- <div class="r-b-t-main">
<span class="r-b-t-left">设备标签</span>
<span class="r-b-t-right">
- <div
- class="r-b-t-r-label"
- v-for="(value,index) in labels"
+ <div
+ class="r-b-t-r-label"
+ v-for="(value,index) in labels"
:key="index"
>
- {{value}}
+ {{value}}
</div>
</span>
</div> -->
@@ -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,
@@ -1013,31 +1015,30 @@
// jtype != 2
// ]
var states,
- o = this.a.onlineStatus,
- s = this.a.state,
- j = this.a.jtype;
- // if (o == 0) {
- // states = "掉线";
- // } else if (o == 1) {
- // states = "在线";
- // } else if (s != "") {
- // states = "故障";
- // } else if (j != 2) {
- // states = "预警";
- // }
- if (s != "") {
+ d = this.a.dtype;
+ if (d == 0) {
+ states = "掉线";
+ } else if (d == 1) {
+ states = "正常";
+ } else if (d == 3) {
states = "故障";
- } else {
- if (j != 1) {
- if (o == 1) {
- states = "在线";
- } else {
- states = "掉线";
- }
- } else {
- states = "预警";
- }
+ } else if (d == 2) {
+ states = "预警";
}
+
+ // if (s != "") {
+ // states = "故障";
+ // } else {
+ // if (j != 1) {
+ // if (o == 1) {
+ // states = "正常";
+ // } else {
+ // states = "掉线";
+ // }
+ // } else {
+ // states = "预警";
+ // }
+ // }
// console.log(o, 1000);
// console.log(s, 1000);
// console.log(j, 1000);
@@ -1086,6 +1087,7 @@
var ds = res.data.data.records;
// console.log(ds)
this.setdataG(ds);
+ this.jingqingPdianji = ds;
});
},
setdataG(d) {
@@ -1125,6 +1127,7 @@
oneContacts: d[key].oneContacts,
alarmPeople: d[key].alarmPeople,
onePhone: d[key].onePhone,
+ jjTime: d[key].jjTime,
childs: [],
});
}
@@ -1197,7 +1200,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) {
@@ -1238,7 +1249,7 @@
dom.play();
});
that.hls.on(Hls.Events.ERROR, function (event, data) {
- console.log(data, 4566824159, "视频播放有问题！！！");
+ // console.log(data, 4566824159, "视频播放有问题！！！");
if (data.fatal) {
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
@@ -1264,10 +1275,16 @@
created() {
// let loadingInstance1 = Loading.service({ fullscreen: true });
// this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
- this.a = this.$route.query;
+ // 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 +1314,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 +1736,6 @@
width: 50%;
}
video::-webkit-media-controls-timeline {
- display: none;
- }
-</style>
\ No newline at end of file
+ display: none;
+}
+</style>
--
Gitblit v1.9.3