From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 16:45:29 +0800
Subject: [PATCH] 支持国标移动位置订阅,收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug

---
 web_src/src/components/dialog/chooseChannelForStream.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 11d7861..d5e5ac3 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,8 +1,8 @@
 <template>
 <div id="chooseChannelFoStream" >
     <div style="font-size: 17px; color: #606060; white-space: nowrap; line-height: 30px; font-family: monospace;">
-      <span v-if="catalogId == null">{{catalogName}}鐨勭洿鎾祦</span>
-      <span v-if="catalogId != null">{{catalogName}}({{catalogId}})鐨勭洿鎾祦</span>
+      <span v-if="catalogId == null">{{catalogName}}鐨勭洿鎾�氶亾</span>
+      <span v-if="catalogId != null">{{catalogName}}({{catalogId}})鐨勭洿鎾�氶亾</span>
     </div>
     <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
 
@@ -174,7 +174,7 @@
                     page: that.currentPage,
                     count: that.count,
                     query: that.searchSrt,
-                    pushing: that.online,
+                    pushing: that.pushing,
                     platformId: that.platformId,
                     catalogId: that.catalogId,
                     mediaServerId: that.mediaServerId

--
Gitblit v1.8.0