Compare commits

..

No commits in common. "23443986e69ea9f65c529a652f3f6a660faaa0ea" and "7ef0cf82310705ffa80bb4a6b51f13a8d678abeb" have entirely different histories.

1 changed files with 50 additions and 57 deletions

View File

@ -3,7 +3,7 @@
<div class="screen-content">
<!-- <div class="analyse-equipment analyse-equipment-position">视频监控</div> -->
<el-row>
<!-- <el-col :span="6">
<el-col :span="6">
<module-one-1-1 label="视频概况" :amplify="true" name="amplify-spjk">
<div class="equipment-list-max">
<el-row>
@ -63,24 +63,27 @@
</div>
</div>
</module-one-2-1>
</el-col> -->
</el-col>
<el-col :span="3">
<module-one-3-1 label="视频列表">
<div class="video-list-max">
<div class="video-list-min">
<div class="video-list-for" v-for="item in videoListData">
<ul class="video-list-ul" v-show="item.type">
<li :class="video.type==true?'active':''" v-for="(video,idx) in item.videoList" @click.stop="handlePlay(video,idx)">
<button :class="video.signalState == 1?'video-state-zx':'video-state-lx'"></button>
<span>{{video.videoName}}</span>
</li>
</ul>
<div class="video-list-title">{{item.project_abbreviation}}</div>
<el-collapse-transition>
<ul class="video-list-ul" v-show="item.type">
<li :class="video.type==true?'active':''" v-for="(video,idx) in item.videoList" @click.stop="handlePlay(video,idx)">
<button :class="video.signalState == 1?'video-state-zx':'video-state-lx'"></button>
<span>{{video.videoName}}</span>
</li>
</ul>
</el-collapse-transition>
</div>
</div>
</div>
</module-one-3-1>
</el-col>
<el-col :span="21">
<el-col :span="15">
<module-one-video>
<div class="video-enlarge-max" v-if="videoType">
<div class="video-enlarge-title">
@ -1428,52 +1431,52 @@ export default {
this.request.replace("{{videoDvrNumber}}", it.videoDvrNumber)
);
},
//
initVideo(videoDvrNumber, url) {
let that = this;
this.$api.video.getVideoPassage(videoDvrNumber).then((response) => {
let data = response.data;
this.videoPassageList = data;
that.showVideo = true;
data.forEach((it, idx) => {
if (idx == 0) {
that.url0 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 1) {
that.url1 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 2) {
that.url2 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 3) {
that.url3 = url.replace("{{passage}}", it.passageValue);
}
});
//
initVideo(videoDvrNumber, url) {
let that = this;
this.$api.video.getVideoPassage(videoDvrNumber).then((response) => {
let data = response.data;
this.videoPassageList = data;
that.showVideo = true;
data.forEach((it, idx) => {
if (idx == 0) {
that.url0 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 1) {
that.url1 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 2) {
that.url2 = url.replace("{{passage}}", it.passageValue);
}
if (idx == 3) {
that.url3 = url.replace("{{passage}}", it.passageValue);
}
});
},
});
},
handleOnError0(error) {
//this.showVideoView0 = false;
console.log("error: ", error);
//this.updatePassageState(this.videoPassageList[0].id);
this.showVideoView0 = false;
console.log("error: ", error);
this.updatePassageState(this.videoPassageList[0].id);
},
handleOnError1(error) {
//this.showVideoView1 = false;
console.log("error: ", error);
//this.updatePassageState(this.videoPassageList[1].id);
this.showVideoView1 = false;
console.log("error: ", error);
this.updatePassageState(this.videoPassageList[1].id);
},
handleOnError2(error) {
//this.showVideoView2 = false;
console.log("error: ", error);
//this.updatePassageState(this.videoPassageList[2].id);
this.showVideoView2 = false;
console.log("error: ", error);
this.updatePassageState(this.videoPassageList[2].id);
},
handleOnError3(error) {
//this.showVideoView3 = false;
console.log("error: ", error);
//this.updatePassageState(this.videoPassageList[3].id);
this.showVideoView3 = false;
console.log("error: ", error);
this.updatePassageState(this.videoPassageList[3].id);
},
updatePassageState(id) {
//
//this.$api.video.editPassageState(id,this.videoDvrNumber,"2");
//
//this.$api.video.editPassageState(id,this.videoDvrNumber,"2");
},
},
@ -1487,22 +1490,12 @@ export default {
.videoView {
color: aliceblue;
float: left;
width: 49.5%;
height: 458px;
margin-bottom:2px;
margin-top:2px;
margin-left:5px;
margin-right:3px;
width: 50%;
height: 452.5px;
}
.videoViewError {
background-color: #575e65;
text-align: center;
line-height: 420px;
}
.video-enlarge-max{
padding:0 !important;
}
.video-enlarge-content{
overflow: hidden;
}
</style>