From 116d979d87f53f878a8c930cfad2c6a7cc831b19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 八月 2022 16:58:31 +0800
Subject: [PATCH] 合并主线
---
web_src/src/components/dialog/chooseChannelForStream.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 0bc8f04..1eec0b2 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;">
@@ -47,8 +47,8 @@
<el-table-column label="鎿嶄綔" width="100" align="center" fixed="right" >
<template slot-scope="scope">
<el-button-group>
- <el-button size="mini" icon="el-icon-plus" v-if="!scope.row.platformId" @click="add(scope.row, scope)">娣诲姞</el-button>
- <el-button size="mini" icon="el-icon-delete" v-if="scope.row.platformId" type="danger" @click="remove(scope.row, scope)">绉婚櫎</el-button>
+ <el-button size="mini" icon="el-icon-plus" v-if="catalogId === null" @click="add(scope.row, scope)">娣诲姞</el-button>
+ <el-button size="mini" icon="el-icon-delete" v-if="catalogId !== null" type="danger" @click="remove(scope.row, scope)">绉婚櫎</el-button>
</el-button-group>
</template>
</el-table-column>
@@ -76,6 +76,7 @@
props: ['platformId', 'catalogId', 'catalogName'],
created() {
this.initData();
+ console.log(this.catalogId)
},
components: {
getCatalog,
@@ -173,7 +174,6 @@
page: that.currentPage,
count: that.count,
query: that.searchSrt,
- pushing: that.online,
platformId: that.platformId,
catalogId: that.catalogId,
mediaServerId: that.mediaServerId
--
Gitblit v1.8.0