From 39899a959b7bc5b8673bc914332c2c68f6a05bfe Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 九月 2023 21:55:02 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/video/index.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 6c98008..13c9229 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -1,10 +1,10 @@
<template>
- <el-container style="height: 100%">
+ <el-container class="video-container" style="height: 100%">
<el-aside heigth="100%" width="200px">
<department-aside @selectedDepartment="selectedDepartment" />
</el-aside>
- <el-container>
+ <el-container class="video-body-right">
<el-header style="display: flex; flex-direction: column; height: 120px">
<div
style="display: flex; justify-content: space-between; height: 80px"
@@ -18,7 +18,7 @@
"
>鏁翠綋瓒嬪娍</span
>
- <el-date-picker 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,11 +127,11 @@
mounted() {},
methods: {
loadVideo(item) {
- if (item.platResourceId) {
+ if (item.code) {
if (Hls.isSupported()) {
var video = document.getElementById(item.id);
var hls = new Hls();
- videoPoint.getVideoPointUrl(item.platResourceId).then((res) => {
+ videoPoint.getVideoPointUrl(item.code).then((res) => {
if (res.code === 0) {
hls.loadSource(res.data);
hls.attachMedia(video);
@@ -191,8 +191,8 @@
if (res) {
// 杩炴帴瀹㈡埛绔垚鍔�
this.ws.login({
- loginIp: "183.245.159.161",
- loginPort: "8282",
+ loginIp: "172.28.194.180",
+ loginPort: "7902",
userName: "suichang",
userPwd: "a12345677",
https: 1,
@@ -220,7 +220,7 @@
});
},
create(item) {
- if (item.code) {
+ if (item.platResourceId) {
const DHWsInstance = DHWs.getInstance();
this.ws = DHWsInstance;
console.log(this.ws);
@@ -298,6 +298,17 @@
};
</script>
<style lang="scss" scoped>
+.video-time-select{
+ &::v-deep .el-input__prefix{
+ height: auto;
+ }
+
+}
+.video-body-right{
+ padding: 10px;
+ border: 1px solid #ccc;
+ margin-left: 5px;
+}
.button-one {
height: 40px;
width: 80px;
@@ -438,4 +449,4 @@
video::-webkit-media-controls-toggle-closed-captions-button {
display: none;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0