XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 重构/1078

Browse Source
This commit is contained in:
lin
2025-07-07 11:46:13 +08:00
parent a424f270e8 51cd14e02e
commit 93c24a74e6
6 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/src/views/common/GroupTree.vue
View File

@@ -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) {
@@ -339,7 +337,7 @@ export default {
for (let i = 0; i < rows.length; i++) {
deviceIds.push(rows[i].id)
}
this.$store.dispatch('group/add', {
this.$store.dispatch('commonChanel/addDeviceToGroup', {
parentId: node.data.deviceId,
businessGroup: node.data.businessGroup,
deviceIds: deviceIds
@@ -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(() => {

11
web/src/views/common/RegionTree.vue
View File

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