From 94a0de0d275ec30feac3aadc8d41db042aa18c6d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 30 九月 2023 06:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannelForStream.vue | 73 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
old mode 100644
new mode 100755
index eeee14e..b522a63
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,5 +1,5 @@
<template>
-<div id="chooseChannelFoStream" >
+<div id="chooseChannelFoStream" v-loading="loading">
<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>
@@ -24,6 +24,8 @@
</el-select>
<el-button v-if="catalogId !== null" icon="el-icon-delete" size="mini" style="margin-right: 1rem;" :disabled="gbStreams.length === 0 || multipleSelection.length === 0" type="danger" @click="batchDel">鎵归噺绉婚櫎</el-button>
<el-button v-if="catalogId === null" icon="el-icon-plus" size="mini" style="margin-right: 1rem;" :disabled="gbStreams.length === 0 || multipleSelection.length === 0" @click="batchAdd">鎵归噺娣诲姞</el-button>
+ <el-button v-if="catalogId === null" icon="el-icon-plus" size="mini" style="margin-right: 1rem;" @click="add()">鍏ㄩ儴娣诲姞</el-button>
+ <el-button v-if="catalogId !== null" type="danger" icon="el-icon-delete" size="mini" style="margin-right: 1rem;" @click="remove()">鍏ㄩ儴绉婚櫎</el-button>
</div>
<el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight" :row-key="(row)=> row.app + row.stream" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" :reserve-selection="true" width="55">
@@ -83,6 +85,7 @@
},
data() {
return {
+ loading: false,
gbStreams: [],
gbChoosechannel:{},
channelType: "",
@@ -128,41 +131,64 @@
},
add: function (row, scope) {
+ let all = typeof(row) === "undefined"
this.getCatalogFromUser((catalogId)=>{
+ let task = null;
this.$axios({
method:"post",
url:"/api/gbStream/add",
data:{
platformId: this.platformId,
catalogId: catalogId,
- gbStreams: [row],
+ all: all,
+ gbStreams: all?[]:[row],
}
}).then((res)=>{
console.log("淇濆瓨鎴愬姛")
+ window.clearTimeout(task);
+ this.loading = false;
// this.gbStreams.splice(scope.$index,1)
this.getChannelList();
}).catch(function (error) {
+ window.clearTimeout(task);
+ this.loading = false;
console.log(error);
});
+ task= setTimeout(()=>{
+ this.loading = true;
+ }, 200)
})
},
remove: function (row, scope) {
- this.$axios({
- method:"delete",
- url:"/api/gbStream/del",
- data:{
- platformId: this.platformId,
- gbStreams: [row],
- }
- }).then((res)=>{
- console.log("绉婚櫎鎴愬姛")
- // this.gbStreams.splice(scope.$index,1)
- this.getChannelList();
- }).catch(function (error) {
- console.log(error);
+ let all = typeof(row) === "undefined"
+ this.$confirm(`纭畾绉婚櫎${all?"鎵�鏈夐�氶亾":""}鍚楋紵`, '鎻愮ず', {
+ dangerouslyUseHTMLString: true,
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+
+ this.$axios({
+ method:"delete",
+ url:"/api/gbStream/del",
+ data:{
+ platformId: this.platformId,
+ all: all,
+ gbStreams: all?[]:[row],
+ }
+ }).then((res)=>{
+ console.log("绉婚櫎鎴愬姛")
+ // this.gbStreams.splice(scope.$index,1)
+ this.getChannelList();
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }).catch(() => {
+
});
+
},
getChannelList: function () {
let that = this;
@@ -174,22 +200,23 @@
page: that.currentPage,
count: that.count,
query: that.searchSrt,
- pushing: that.online,
platformId: that.platformId,
catalogId: that.catalogId,
mediaServerId: that.mediaServerId
}
})
.then(function (res) {
- that.total = res.data.total;
- that.gbStreams = res.data.list;
- that.gbChoosechannel = {};
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- that.$nextTick(() => {
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.gbStreams = res.data.data.list;
+ that.gbChoosechannel = {};
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ that.$nextTick(() => {
that.$refs.gbStreamsTable.doLayout();
// 榛樿閫変腑
- that.eventEnable = true;
- })
+ that.eventEnable = true;
+ })
+ }
})
.catch(function (error) {
console.log(error);
--
Gitblit v1.8.0