From a51b41110104ff43bbd716fddd3e44368256beef Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期二, 19 七月 2022 18:13:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/PushVideoList.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index d8d3aca..58ce8a2 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -62,7 +62,12 @@
</el-table-column>
<el-table-column label="姝ｅ湪鎺ㄦ祦" min-width="100">
<template slot-scope="scope">
- {{scope.row.status ? '鏄�' : '鍚�' }}
+ {{scope.row.pushIng ? '鏄�' : '鍚�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈钩鍙版帹娴�" min-width="100">
+ <template slot-scope="scope">
+ {{scope.row.pushIng && !!!scope.row.serverId ? '鏄�' : '鍚�' }}
</template>
</el-table-column>
--
Gitblit v1.8.0