From 893fc457a2daeb0aa33a5a9d0b32eef7db238c1f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 十月 2023 21:58:07 +0800
Subject: [PATCH] bug修改
---
src/views/systemSetting/device/point/index.vue | 59 +++++++++++++++++------------
src/views/video/index.vue | 54 ++++++++++++--------------
src/views/smoke/alarm/index.vue | 2
3 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/src/views/smoke/alarm/index.vue b/src/views/smoke/alarm/index.vue
index a56f829..dc098df 100644
--- a/src/views/smoke/alarm/index.vue
+++ b/src/views/smoke/alarm/index.vue
@@ -58,7 +58,7 @@
</template>
<script>
-import MyHeader from "./components/header";
+import MyHeader from "./header";
import realTimeApi from "@/api/smoke/alarm";
export default {
data() {
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index 6b0d6e3..2f11ed6 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -5,7 +5,14 @@
</el-aside>
<el-container class="point-container">
- <el-header style="display: flex; flex-direction: column; height: 120px;padding: 0 40px">
+ <el-header
+ style="
+ display: flex;
+ flex-direction: column;
+ height: 120px;
+ padding: 0 40px;
+ "
+ >
<div
style="display: flex; justify-content: space-between; height: 80px"
>
@@ -28,7 +35,7 @@
<div
v-for="item in videoData"
:key="item.id"
- style="position: relative;height:350px"
+ style="position: relative; height: 350px"
>
<div class="video-title">{{ item.name }}{{ item.community }}</div>
@@ -104,30 +111,32 @@
.catch((err) => this.$message.error(err));
},
loadVideo(item) {
- if (item.code) {
+ if (item.code || item.platResourceId) {
if (Hls.isSupported()) {
var video = document.getElementById(item.id);
var hls = new Hls();
- videoPoint.getVideoPointUrl(item.code).then((res) => {
- if (res.code === 0) {
- hls.loadSource(res.data);
- hls.attachMedia(video);
- this.videoList.push(video);
- // hls.on(Hls.Events.MANIFEST_PARSED, function () {
- // // video.play();
- // document.body.addEventListener(
- // "click",
- // function () {
- // video.play();
- // },
- // false
- // );
- // });
- setTimeout(() => {
- video.play();
- }, 2000);
- }
- });
+ videoPoint
+ .getVideoPointUrl(item.code || item.platResourceId)
+ .then((res) => {
+ if (res.code === 0) {
+ hls.loadSource(res.data);
+ hls.attachMedia(video);
+ this.videoList.push(video);
+ // hls.on(Hls.Events.MANIFEST_PARSED, function () {
+ // // video.play();
+ // document.body.addEventListener(
+ // "click",
+ // function () {
+ // video.play();
+ // },
+ // false
+ // );
+ // });
+ setTimeout(() => {
+ video.play();
+ }, 2000);
+ }
+ });
}
} else {
this.$message.error("鏆傛棤瑙嗛");
@@ -153,7 +162,7 @@
};
</script>
<style lang="scss" scoped>
-.point-container{
+.point-container {
margin-left: 5px;
border: 1px solid #ccc;
padding: 10px;
@@ -167,7 +176,7 @@
color: rgb(75, 155, 183);
border: 1px solid rgb(75, 155, 183);
}
-.title{
+.title {
color: #333;
}
.button-two {
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 13c9229..d601e9c 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -18,7 +18,12 @@
"
>鏁翠綋瓒嬪娍</span
>
- <el-date-picker class="video-time-select" v-model="value" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ class="video-time-select"
+ v-model="value"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</div>
<!-- <div style="height: 60px; display: flex; justify-content: flex-start">
@@ -127,29 +132,21 @@
mounted() {},
methods: {
loadVideo(item) {
- if (item.code) {
+ if (item.code || item.platResourceId) {
if (Hls.isSupported()) {
var video = document.getElementById(item.id);
var hls = new Hls();
- videoPoint.getVideoPointUrl(item.code).then((res) => {
- if (res.code === 0) {
- hls.loadSource(res.data);
- hls.attachMedia(video);
- // hls.on(Hls.Events.MANIFEST_PARSED, function () {
- // video.play();
- // document.body.addEventListener(
- // "click",
- // function () {
- // video.play();
- // },
- // false
- // );
- // });
- setTimeout(() => {
- video.play();
- }, 2000);
- }
- });
+ videoPoint
+ .getVideoPointUrl(item.code || item.platResourceId)
+ .then((res) => {
+ if (res.code === 0) {
+ hls.loadSource(res.data);
+ hls.attachMedia(video);
+ setTimeout(() => {
+ video.play();
+ }, 2000);
+ }
+ });
}
} else {
this.$message.error("鏆傛棤瑙嗛");
@@ -220,7 +217,7 @@
});
},
create(item) {
- if (item.platResourceId) {
+ if (item.platResourceId && item.code) {
const DHWsInstance = DHWs.getInstance();
this.ws = DHWsInstance;
console.log(this.ws);
@@ -298,13 +295,12 @@
};
</script>
<style lang="scss" scoped>
-.video-time-select{
- &::v-deep .el-input__prefix{
- height: auto;
- }
-
+.video-time-select {
+ &::v-deep .el-input__prefix {
+ height: auto;
+ }
}
-.video-body-right{
+.video-body-right {
padding: 10px;
border: 1px solid #ccc;
margin-left: 5px;
@@ -413,7 +409,7 @@
// }
// ::v-deep .el-menu {
- // background-color: #09152f;
+// background-color: #09152f;
// }
::v-deep .el-main,
--
Gitblit v1.8.0