From 20dca0f6b664f6124e3492eee2e3ef6dfde80d88 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Fri, 2 Apr 2021 19:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91=E5=88=B0=E5=9B=BD=E6=A0=87=EF=BC=8C=E5=B0=9A=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/wvp.sqlite            | Bin 98304 -> 98304 bytes
 web_src/src/components/PushVideoList.vue |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite
index f6c72578baec7cbb3dacd2a8a2a3317e2a6336e2..3cb64cf4c6b83c28c3018519c80b13458d0bdc6f 100644
GIT binary patch
delta 207
zcmZo@U~6b#n;<RthJk@W0*Hlxm<fn9C+Zk8zS)?t;Qw|70Y-KKRz{$N;C4X)#xMMf
z6a*Fp2tdef35<*avRs=OI5|%-@NeSt<rC(y;{L*UiuXR(U#_FPlXxd>Y+TI2!nKK!
zb7Lbb<MdONj4z~kxfq0j<{<;qrVKW5Pvz-y8H^IsFIF*1XoxfxH>I<SD=RZL>y{)Y
g<)jvu6s0ES#ut<pXCN_!rwdjyZr*;qno*Ml0MCXu(EtDd

delta 200
zcmZo@U~6b#n;<Rtnt_2q0*FO`m<fo~Ch8b7zTTLy;Qt~8fkgoVn-xB=3$QW*Wra5j
ze)z%<5#5%+$S5Go%f-OSd5VF56Q3`iFpm}Y7p_-an>bJL-se5Wdu(IlS`HRoF2?5*
z8(#xyh9A@SRWg2IH*HE`6Zce}E|<Y5G5tvuqlAV~6I)X<ySTD4V{>pxVp2|OaY<2X
kVs3mvX>kS;Q*gRUHRI;#O}UK1)BCCzrM7>pX5?o90D0~{DF6Tf

diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 0955cc9f..6e73f370 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -28,7 +28,7 @@
 					</el-table-column>
 					<el-table-column label="正在推流" align="center" >
 						<template slot-scope="scope">
-							{{!!scope.row.status?'是':'否'}}
+							{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'是':'否'}}
 						</template>
 					</el-table-column>