From 51cd14e02efb2526d2bf84105debda68390d4750 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 4 Jul 2025 14:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E4=B8=9A=E5=8A=A1=E5=88=86=E7=BB=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E5=90=8E=E6=9B=B4=E6=96=B0=E5=8F=B3=E8=BE=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/channel/group/index.vue  |  7 +++++--
 web/src/views/channel/region/index.vue |  6 ++++--
 web/src/views/common/GroupTree.vue     | 15 ++++-----------
 web/src/views/common/RegionTree.vue    | 11 ++++-------
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/web/src/views/channel/group/index.vue b/web/src/views/channel/group/index.vue
index 256171cec..1484b6031 100755
--- a/web/src/views/channel/group/index.vue
+++ b/web/src/views/channel/group/index.vue
@@ -5,7 +5,7 @@
       :show-header="true"
       :edit="true"
       @clickEvent="treeNodeClickEvent"
-      :on-channel-change="onChannelChange"
+      @onChannelChange="onChannelChange"
       :enable-add-channel="true"
       :add-channel-to-group="addChannelToGroup"
     />
@@ -306,7 +306,10 @@ export default {
         })
     },
     onChannelChange: function(deviceId) {
-      //
+
+      if (this.groupDeviceId === deviceId) {
+        this.getChannelList()
+      }
     },
     showUnusualChanel: function() {
       this.$refs.unusualGroupChannelSelect.openDialog()
diff --git a/web/src/views/channel/region/index.vue b/web/src/views/channel/region/index.vue
index 367b6d335..9a846c65b 100755
--- a/web/src/views/channel/region/index.vue
+++ b/web/src/views/channel/region/index.vue
@@ -5,7 +5,7 @@
       :show-header="true"
       :edit="true"
       @clickEvent="treeNodeClickEvent"
-      :on-channel-change="onChannelChange"
+      @onChannelChange="onChannelChange"
       :enable-add-channel="true"
       :add-channel-to-civil-code="addChannelToCivilCode"
     />
@@ -296,7 +296,9 @@ export default {
       console.log(selectedData)
     },
     onChannelChange: function(deviceId) {
-      //
+      if (this.regionDeviceId === deviceId) {
+        this.getChannelList()
+      }
     }
   }
 }
diff --git a/web/src/views/common/GroupTree.vue b/web/src/views/common/GroupTree.vue
index d22c09a02..cb336db06 100755
--- a/web/src/views/common/GroupTree.vue
+++ b/web/src/views/common/GroupTree.vue
@@ -130,7 +130,7 @@ export default {
     GbChannelSelect,
     VueEasyTree, groupEdit, gbDeviceSelect
   },
-  props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
+  props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
   data() {
     return {
       props: {
@@ -328,9 +328,7 @@ export default {
         .then(data => {
           node.parent.loaded = false
           node.parent.expand()
-          if (this.onChannelChange) {
-            this.onChannelChange(node.data.deviceId)
-          }
+          this.$emit('onChannelChange', node.data.deviceId)
         })
     },
     addChannelFormDevice: function(id, node) {
@@ -349,10 +347,7 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            if (this.onChannelChange) {
-              this.onChannelChange()
-            }
-            console.log(node)
+            this.$emit('onChannelChange', node.data.deviceId)
             node.loaded = false
             node.expand()
           }).finally(() => {
@@ -372,9 +367,7 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            if (this.onChannelChange) {
-              this.onChannelChange()
-            }
+            this.$emit('onChannelChange', node.data.deviceId)
             node.loaded = false
             node.expand()
           }).finally(() => {
diff --git a/web/src/views/common/RegionTree.vue b/web/src/views/common/RegionTree.vue
index 991396825..e51019059 100755
--- a/web/src/views/common/RegionTree.vue
+++ b/web/src/views/common/RegionTree.vue
@@ -131,7 +131,7 @@ export default {
     GbChannelSelect,
     VueEasyTree, regionEdit, gbDeviceSelect
   },
-  props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
+  props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
   data() {
     return {
       props: {
@@ -331,6 +331,7 @@ export default {
       this.$store.dispatch('region/deleteRegion', node.data.id)
         .then((data) => {
           console.log('移除成功')
+          this.$emit('onChannelChange', node.data.deviceId)
           node.parent.loaded = false
           node.parent.expand()
         }).catch(function(error) {
@@ -351,9 +352,7 @@ export default {
             showClose: true,
             message: '保存成功'
           })
-          if (this.onChannelChange) {
-            this.onChannelChange()
-          }
+          this.$emit('onChannelChange', node.data.deviceId)
           node.loaded = false
           node.expand()
         }).catch(function(error) {
@@ -375,9 +374,7 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            if (this.onChannelChange) {
-              this.onChannelChange(node.data.deviceId)
-            }
+            this.$emit('onChannelChange', node.data.deviceId)
             node.loaded = false
             node.expand()
           }).catch(function(error) {