From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
web_src/src/components/dialog/getCatalog.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/dialog/getCatalog.vue b/web_src/src/components/dialog/getCatalog.vue
old mode 100644
new mode 100755
index a146889..fdc26de
--- 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",
@@ -119,14 +117,12 @@
if (res.data.code === 0) {
this.platformName = res.data.data.name;
this.defaultCatalogId = res.data.data.catalogId;
+ this.defaultCatalogIdSign = res.data.data.catalogId;
+ this.chooseId = res.data.data.catalogId;
resolve([
- {
- name: "鏈垎閰�",
- id: null,
- type: -1
- },{
+ {
name: this.platformName,
- id: this.platformId,
+ id: res.data.data.deviceGBId,
type: 0
}
]);
@@ -144,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