From 28df05e261c0d63050d0bd938b7a6a2c2938b8e9 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 06 八月 2022 09:42:28 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/PushVideoList.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 6a415f7..6b4707e 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -69,14 +69,14 @@
</el-table-column>
<el-table-column label="鏈钩鍙版帹娴�" min-width="100">
<template slot-scope="scope">
- {{scope.row.pushIng && !!!scope.row.serverId ? '鏄�' : '鍚�' }}
+ {{scope.row.pushIng && !!scope.row.self ? '鏄�' : '鍚�' }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="360" fixed="right">
<template slot-scope="scope">
<el-button size="medium" icon="el-icon-video-play"
- v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status"
+ v-if="scope.row.pushIng === true"
@click="playPush(scope.row)" type="text">鎾斁
</el-button>
<el-divider direction="vertical"></el-divider>
@@ -202,10 +202,15 @@
}
}).then(function (res) {
that.getListLoading = false;
- that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
- streamInfo: res.data.data,
- hasAudio: true
- });
+ if (res.data.code === 0 ) {
+ that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
+ streamInfo: res.data.data,
+ hasAudio: true
+ });
+ }else {
+ that.$message.error(res.data.msg);
+ }
+
}).catch(function (error) {
console.error(error);
that.getListLoading = false;
--
Gitblit v1.8.0