From e7bdcc1f8ddf95ca4b0bb08fbcd962a8d8a2b83a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 06 九月 2022 16:31:28 +0800
Subject: [PATCH] 修复选择通道时默认节点显示错误的问题
---
web_src/src/components/dialog/chooseChannel.vue | 7 +++++--
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 2 +-
web_src/src/components/ParentPlatformList.vue | 3 ++-
web_src/src/components/dialog/chooseChannelForCatalog.vue | 7 +++++--
web_src/src/components/dialog/getCatalog.vue | 16 ++++++++++++----
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index c8ab2e8..b056cc7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -53,7 +53,7 @@
/**
* 璁惧鍥芥爣缂栧彿
*/
- @Schema(description = "11111")
+ @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceGBId;
/**
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 0cd517d..61e93fc 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -143,7 +143,8 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, platform.name, platform.catalogId, platform.treeType, this.initData)
+ console.log("platform.name: " + platform.name)
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId,platform.deviceGBId, platform.name, platform.catalogId, platform.treeType, this.initData)
},
initData: function() {
this.getPlatformList();
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index ad911e8..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" :treeType=treeType ></chooseChannelForCatalog>
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></chooseChannelForCatalog>
</el-main>
</el-container>
</el-tab-pane>
@@ -60,6 +60,7 @@
tabActiveName: "gbChannel",
catalogTabActiveName: "catalog",
platformId: "",
+ platformDeviceId: "",
catalogId: "",
catalogName: "",
currentCatalogId: "",
@@ -73,8 +74,10 @@
};
},
methods: {
- openDialog(platformId, platformName, defaultCatalogId, treeType, 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
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index 4303a2f..c634b77 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -38,7 +38,7 @@
import catalogEdit from './catalogEdit.vue'
export default {
name: 'chooseChannelForCatalog',
- props: ['platformId', 'platformName', 'defaultCatalogId', 'catalogIdChange', 'treeType'],
+ props: ['platformId', 'platformDeviceId', 'platformName', 'defaultCatalogId', 'catalogIdChange', 'treeType'],
created() {
this.chooseId = this.defaultCatalogId;
this.defaultCatalogIdSign = this.defaultCatalogId;
@@ -171,6 +171,7 @@
});
},
loadNode: function(node, resolve){
+ console.log("this.platformDeviceId锛� " + this.platformDeviceId)
if (node.level === 0) {
resolve([
{
@@ -179,7 +180,7 @@
type: -1
},{
name: this.platformName,
- id: this.platformId,
+ id: this.platformDeviceId,
type: 0
}
]);
@@ -298,6 +299,8 @@
return false;
},
nodeClickHandler: function (data, node, tree){
+ console.log(data)
+ console.log(node)
this.chooseId = data.id;
this.chooseName = data.name;
if (this.catalogIdChange)this.catalogIdChange(this.chooseId, this.chooseName);
diff --git a/web_src/src/components/dialog/getCatalog.vue b/web_src/src/components/dialog/getCatalog.vue
index 62bacdb..fdc26de 100644
--- a/web_src/src/components/dialog/getCatalog.vue
+++ b/web_src/src/components/dialog/getCatalog.vue
@@ -77,6 +77,7 @@
},
methods: {
openDialog(catalogIdResult) {
+ console.log(this.chooseId)
this.showDialog = true
this.catalogIdResult = catalogIdResult
},
@@ -107,9 +108,6 @@
},
loadNode: function(node, resolve){
-
-
-
if (node.level === 0) {
this.$axios({
method:"get",
@@ -124,7 +122,7 @@
resolve([
{
name: this.platformName,
- id: this.platformId,
+ id: res.data.data.deviceGBId,
type: 0
}
]);
@@ -142,9 +140,19 @@
this.chooseId = data.id;
},
close: function() {
+ this.chooseId = null;
this.showDialog = false;
},
submit: function() {
+ console.log(this.chooseId)
+ if (this.chooseId === null) {
+ this.$message({
+ showClose: true,
+ message: '鏈�夋嫨浠讳綍鑺傜偣,',
+ type: 'warning'
+ });
+ return;
+ }
if (this.catalogIdResult)this.catalogIdResult(this.chooseId)
this.showDialog = false;
},
--
Gitblit v1.8.0