From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/device/point/index.vue | 151 ++++++++++++++++++++++++++++++--------------------
1 files changed, 91 insertions(+), 60 deletions(-)
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index 9093623..7bb4603 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -4,8 +4,8 @@
<department-aside @selectedDepartment="selectedDepartment" />
</el-aside>
- <el-container>
- <el-header style="display: flex; flex-direction: column; height: 120px">
+ <el-container class="point-container">
+ <el-header style="display: flex; flex-direction: column; height: 120px;padding: 0 40px">
<div
style="display: flex; justify-content: space-between; height: 80px"
>
@@ -80,7 +80,7 @@
videoData: [],
searchData: null,
hls: null,
- videoList:[]
+ videoList: [],
};
},
methods: {
@@ -104,29 +104,33 @@
.catch((err) => this.$message.error(err));
},
loadVideo(item) {
- if (Hls.isSupported()) {
- var video = document.getElementById(item.id);
- var hls = new Hls();
- videoPoint.getVideoPointUrl(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);
- }
- });
+ if (item.platResourceId) {
+ if (Hls.isSupported()) {
+ var video = document.getElementById(item.id);
+ var hls = new Hls();
+ videoPoint.getVideoPointUrl(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("鏆傛棤瑙嗛");
}
},
selectedDepartment(data) {
@@ -141,29 +145,36 @@
this.getVideoPointList(this.searchData);
},
},
- beforeDestroy(){
- videoList.forEach(element => {
- element.push()
+ beforeDestroy() {
+ this.videoList.forEach((element) => {
+ element.push();
});
},
};
</script>
<style lang="scss" scoped>
+.point-container{
+ margin-left: 5px;
+ border: 1px solid #ccc;
+ padding: 10px;
+}
.button-one {
height: 40px;
width: 80px;
- margin-left: 20px;
+ //margin-left: 20px;
padding: 0;
- background-color: #09152f;
+ // background-color: #09152f;
color: rgb(75, 155, 183);
border: 1px solid rgb(75, 155, 183);
}
-
+.title{
+ color: #333;
+}
.button-two {
height: 40px;
width: 80px;
padding: 0;
- background-color: #09152f;
+ // background-color: #09152f;
color: rgb(75, 155, 183);
border: 1px solid rgb(75, 155, 183);
}
@@ -174,7 +185,7 @@
height: 40px;
width: 80px;
padding: 0;
- background-color: #09152f;
+ // background-color: #09152f;
color: rgb(75, 155, 183);
border: 1px solid rgb(75, 155, 183);
}
@@ -235,17 +246,17 @@
}
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
.bottonThird {
@@ -260,27 +271,47 @@
cursor: pointer;
}
-::v-deep .el-header {
- background-color: #09152f;
- color: #000;
- line-height: 60px;
-}
+// ::v-deep .el-header {
+// background-color: #09152f;
+// color: #000;
+// line-height: 60px;
+// }
-::v-deep .el-aside {
- background-color: #09152f;
-}
+// ::v-deep .el-aside {
+// background-color: #09152f;
+// }
-::v-deep .el-menu {
- background-color: #09152f;
-}
+// ::v-deep .el-menu {
+// background-color: #09152f;
+// }
-::v-deep .el-main,
-::v-deep .el-footer {
- background-color: #09152f;
-}
+// ::v-deep .el-main,
+// ::v-deep .el-footer {
+// background-color: #09152f;
+// }
::v-deep .el-tree-node__label {
line-height: 30px;
font-size: 14px;
}
-</style>
\ No newline at end of file
+
+video::-webkit-media-controls-timeline {
+ display: none;
+}
+
+video::-webkit-media-controls-current-time-display {
+ display: none;
+}
+
+video::-webkit-media-controls-time-remaining-display {
+ display: none;
+}
+
+video::-webkit-media-controls-mute-button {
+ display: none;
+}
+
+video::-webkit-media-controls-toggle-closed-captions-button {
+ display: none;
+}
+</style>
--
Gitblit v1.8.0