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) {