From d4ae8194eb87271423aba24bab0f0d815d5ffdc1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 13 十月 2020 14:46:47 +0800
Subject: [PATCH] 离在线状态样式修改 修复未回复200ok导致catalog一直发送的bug 修改点播接口未收到视频后回复
---
web_src/src/components/channelList.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 5cd108e..7a1e0e2 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -35,8 +35,16 @@
</el-table-column>
<el-table-column prop="subCount" label="瀛愯妭鐐规暟">
</el-table-column>
- <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷">
- </el-table-column>
+ <el-table-column label="鐘舵��" width="180" align="center">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium" v-if="scope.row.status == 1">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status == 0">绂荤嚎</el-tag>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷">
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="240" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">棰勮瑙嗛</el-button>
@@ -58,17 +66,20 @@
</el-main>
</el-container>
+ <Loading v-if="isLoging" marginTop="-50%"></Loading>
</div>
</template>
<script>
import devicePlayer from './gb28181/devicePlayer.vue'
import uiHeader from './UiHeader.vue'
+ import Loading from './Loading.vue'
export default {
name: 'channelList',
components: {
devicePlayer,
- uiHeader
+ uiHeader,
+ Loading
},
data() {
return {
@@ -85,7 +96,8 @@
currentPage: parseInt(this.$route.params.page),
count: parseInt(this.$route.params.count),
total:0,
- beforeUrl:"/videoList"
+ beforeUrl:"/videoList",
+ isLoging: false
};
},
@@ -182,7 +194,7 @@
//閫氱煡璁惧涓婁紶濯掍綋娴�
sendDevicePush: function(itemData) {
let deviceId = this.deviceId;
-
+ this.isLoging = true;
let channelId = itemData.channelId;
console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId);
let that = this;
@@ -191,6 +203,7 @@
url: '/api/play/' + deviceId + '/' + channelId
}).then(function(res) {
let ssrc = res.data.ssrc;
+ that.isLoging = false
that.$refs.devicePlayer.play(res.data,deviceId,channelId);
}).catch(function(e) {
});
--
Gitblit v1.8.0