From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 04 四月 2023 09:09:07 +0800 Subject: [PATCH] 合并开源主线 --- web_src/src/components/dialog/chooseChannelForGb.vue | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue index 270bcda..bc71577 100644 --- a/web_src/src/components/dialog/chooseChannelForGb.vue +++ b/web_src/src/components/dialog/chooseChannelForGb.vue @@ -1,5 +1,5 @@ <template> -<div id="chooseChannelForGb" > +<div id="chooseChannelForGb" 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> @@ -79,6 +79,7 @@ }, data() { return { + loading: false, gbChannels: [], gbChoosechannel:{}, searchSrt: "", @@ -118,10 +119,12 @@ }, add: function (row) { let all = typeof(row) === "undefined" + this.getCatalogFromUser((catalogId)=> { + let task = null; this.$axios({ method:"post", - url:"./api/platform/update_channel_for_gb", + url:"/api/platform/update_channel_for_gb", data:{ platformId: this.platformId, all: all, @@ -130,11 +133,19 @@ } }).then((res)=>{ console.log("淇濆瓨鎴愬姛") + window.clearTimeout(task); + this.loading = false; this.getChannelList(); - }).catch(function (error) { + }).catch((error)=> { + window.clearTimeout(task); + this.loading = false; console.log(error); }); + task= setTimeout(()=>{ + this.loading = true; + }, 200) }) + }, remove: function (row) { @@ -149,7 +160,7 @@ this.$axios({ method:"delete", - url:"./api/platform/del_channel_for_gb", + url:"/api/platform/del_channel_for_gb", data:{ platformId: this.platformId, all: all, @@ -248,7 +259,7 @@ this.$axios({ method:"get", - url:`./api/platform/channel_list`, + url:`/api/platform/channel_list`, params: { page: that.currentPage, count: that.count, @@ -290,7 +301,7 @@ }).then(() => { this.$axios({ method:"delete", - url:"./api/platform/del_channel_for_gb", + url:"/api/platform/del_channel_for_gb", data:{ platformId: this.platformId, channelReduces: this.multipleSelection @@ -310,7 +321,7 @@ this.$axios({ method: "post", - url: "./api/platform/update_channel_for_gb", + url: "/api/platform/update_channel_for_gb", data: { platformId: this.platformId, channelReduces: this.multipleSelection, -- Gitblit v1.8.0