From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 十月 2021 11:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/CloudRecord.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index c08a6cc..f5d052a 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -8,7 +8,8 @@
<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
<span style="font-size: 1rem; font-weight: bold;">浜戠褰曞儚</span>
<div style="position: absolute; right: 5rem; top: 0.3rem;">
- 鑺傜偣閫夋嫨: <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨">
+ 鑺傜偣閫夋嫨:
+ <el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
<el-option
v-for="item in mediaServerList"
:key="item.id"
@@ -110,7 +111,7 @@
},
getMediaServerList: function (){
let that = this;
- that.mediaServerObj.getMediaServerList((data)=>{
+ that.mediaServerObj.getOnlineMediaServerList((data)=>{
that.mediaServerList = data.data;
if (that.mediaServerList.length > 0) {
that.mediaServerId = that.mediaServerList[0].id
--
Gitblit v1.8.0