From 4f11d6a54ade61ba7daf8ba856014d2f8994badf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 08:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/dataL/dataL.vue | 79 ++++++++++++++-------------------------
1 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 00e6aea..0917c68 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -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> -->
@@ -1005,46 +1005,20 @@
});
});
},
- stetDetails(d, imgdata) {
+ stetDetails(c, imgdata) {
this.name = "无数据" && this.a.deviceName;
//设备状态
- // [grey,green,red][
- // onlineStatus = 0,
- // onlineStatus = 1,
- // state!= "",
- // 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 = "预警";
}
- // console.log(o, 1000);
- // console.log(s, 1000);
- // console.log(j, 1000);
-
- // console.log(states, 1000);
this.state = states;
this.evaluate = "空气质量";
@@ -1075,7 +1049,7 @@
installation: this.a.stime, // 安装时间
heartbeat: this.a.heartbeat, // 心跳时间
};
- this.form = d;
+ this.form = c;
},
getdataG() {
var dataG = {
@@ -1187,7 +1161,7 @@
this.startEcharts01();
},
getMap() {
- window.frames[0].init("DetailMap", {
+ window.frames[1].init("DetailMap", {
x: this.a.jd,
y: this.a.wd,
});
@@ -1250,7 +1224,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:
@@ -1283,7 +1257,7 @@
this.a = this.$route.query;
this.$store.commit("SET_DATAL", this.a);//每次都缓存在vuex中，如果没有从正确路径进来，则使用缓存
}
- console.log(this.a);
+ // console.log(this.a);
this.baseUrl = `/map/index.html?ISinit=1&openid=DetailMap&jd=${this.a.jd}&wd=${this.a.wd}`;
this.myDeviceNumber = this.a.deviceNumber;
// console.log(this.a);
@@ -1298,15 +1272,15 @@
// this.doEvents();
// var timel = setTimeout(() => {
this.$refs.detailMap.onload = () => {
- // window.frames[0].init("DetailMap", {
+ // window.frames[1].init("DetailMap", {
// x: this.a.jd,
// y: this.a.wd,
// });
- if (window.frames[0].init) {
+ if (window.frames[1].init) {
this.getMap();
} else {
// this.re();
- console.log(`没有找到到window.frames[0].init`);
+ console.log(`没有找到到window.frames[1].init`);
}
};
},
@@ -1328,6 +1302,9 @@
};
</script>
<style lang="scss" >
+video::-webkit-media-controls-timeline {
+ display: none;
+ }
#Lour {
width: 100%;
font-size: 14px;
@@ -1739,4 +1716,4 @@
video::-webkit-media-controls-timeline {
display: none;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3