From c3ce2bc5d069ba57309567aee4ae418bc0cf75ed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 17 三月 2023 13:22:05 +0800
Subject: [PATCH] 优化异常处理以及级联设备状态查询
---
web_src/src/components/dialog/chooseChannel.vue | 46 +++++++++++++++-------------------------------
1 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 23df2c1..e0e79c3 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -8,7 +8,7 @@
<el-tab-pane label="鐩綍缁撴瀯" name="catalog">
<el-container>
<el-main v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
- <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange"></chooseChannelForCatalog>
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></chooseChannelForCatalog>
</el-main>
</el-container>
</el-tab-pane>
@@ -20,14 +20,14 @@
<el-tab-pane label="鍥芥爣閫氶亾" name="gbChannel">
<el-container>
<el-main style="background-color: #FFF;">
- <chooseChannelForGb ref="chooseChannelForGb" :catalogId="catalogId" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelForGb>
+ <chooseChannelForGb ref="chooseChannelForGb" :catalogId="catalogId" :catalogName="catalogName" :platformId=platformId ></chooseChannelForGb>
</el-main>
</el-container>
</el-tab-pane>
<el-tab-pane label="鐩存挱娴侀�氶亾" name="streamchannel">
<el-container>
<el-main style="background-color: #FFF;">
- <chooseChannelFoStream ref="chooseChannelFoStream" :catalogId="catalogId" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
+ <chooseChannelFoStream ref="chooseChannelFoStream" :catalogId="catalogId" :catalogName="catalogName" :currentCatalogId="currentCatalogId" :platformId=platformId ></chooseChannelFoStream>
</el-main>
</el-container>
</el-tab-pane>
@@ -52,13 +52,7 @@
chooseChannelForCatalog,
},
computed: {
- // getPlayerShared: function () {
- // return {
- // sharedUrl: window.location.host + '/' + this.videoUrl,
- // sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
- // sharedRtmp: this.videoUrl
- // };
- // }
+
},
data() {
return {
@@ -66,32 +60,31 @@
tabActiveName: "gbChannel",
catalogTabActiveName: "catalog",
platformId: "",
+ platformDeviceId: "",
catalogId: "",
+ catalogName: "",
+ currentCatalogId: "",
platformName: "",
defaultCatalogId: "",
showDialog: false,
+ treeType: null,
chooseData: {},
winHeight: window.innerHeight - 250,
};
},
methods: {
- openDialog(platformId, platformName, defaultCatalogId, closeCallback) {
+ openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, treeType, closeCallback) {
+ console.log("defaultCatalogId: " + defaultCatalogId)
this.platformId = platformId
+ this.platformDeviceId = platformDeviceId
this.platformName = platformName
this.defaultCatalogId = defaultCatalogId
this.showDialog = true
this.closeCallback = closeCallback
+ this.treeType = treeType
},
tabClick (tab, event){
- console.log(tab.label)
- if (tab.label === "gbChannel") {
- this.$refs.chooseChannelForGb.catalogIdChange(this.catalogId);
- this.$refs.chooseChannelForGb.initData();
- }else {
- this.$refs.chooseChannelFoStream.catalogIdChange(this.catalogId);
- this.$refs.chooseChannelFoStream.initData();
- }
},
close: function() {
@@ -111,7 +104,7 @@
channelReduces: that.chooseData
}
}).then((res)=>{
- if (res.data == true) {
+ if (res.data.code === 0) {
that.$message({
showClose: true,
message: '淇濆瓨鎴愬姛,',
@@ -122,19 +115,10 @@
console.log(error);
});
},
- catalogIdChange: function (id) {
- console.log("涓棿妯″潡鏀跺埌锛� " + id)
+ catalogIdChange: function (id, name) {
this.catalogId = id;
- if (this.tabActiveName === "gbChannel") {
- this.$refs.chooseChannelForGb.catalogIdChange(id);
- }else {
- this.$refs.chooseChannelFoStream.catalogIdChange(id);
- }
+ this.catalogName = name;
},
- updateChooseChannelCallback (id){
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + id)
- this.$refs.chooseChannelForCatalog.refreshCatalogById(id)
- }
}
};
</script>
--
Gitblit v1.8.0