Pre Merge pull request !34 from WangXuewen/master

web/src/views/channel/group/index.vue

@@ -5,7 +5,7 @@
       :show-header="true"
       :edit="true"
       @clickEvent="treeNodeClickEvent"
-      @onChannelChange="onChannelChange"
+      :on-channel-change="onChannelChange"
       :enable-add-channel="true"
       :add-channel-to-group="addChannelToGroup"
     />
@@ -306,10 +306,7 @@ export default {
         })
     },
     onChannelChange: function(deviceId) {
-
+      //
-      if (this.groupDeviceId === deviceId) {
-        this.getChannelList()
-      }
     },
     showUnusualChanel: function() {
       this.$refs.unusualGroupChannelSelect.openDialog()

web/src/views/channel/region/index.vue

@@ -5,7 +5,7 @@
       :show-header="true"
       :edit="true"
       @clickEvent="treeNodeClickEvent"
-      @onChannelChange="onChannelChange"
+      :on-channel-change="onChannelChange"
       :enable-add-channel="true"
       :add-channel-to-civil-code="addChannelToCivilCode"
     />
@@ -296,9 +296,7 @@ export default {
       console.log(selectedData)
     },
     onChannelChange: function(deviceId) {
-      if (this.regionDeviceId === deviceId) {
+      //
-        this.getChannelList()
-      }
     }
   }
 }

web/src/views/common/GroupTree.vue

@@ -130,7 +130,7 @@ export default {
     GbChannelSelect,
     VueEasyTree, groupEdit, gbDeviceSelect
   },
-  props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
+  props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
   data() {
     return {
       props: {
@@ -328,7 +328,9 @@ export default {
         .then(data => {
           node.parent.loaded = false
           node.parent.expand()
-          this.$emit('onChannelChange', node.data.deviceId)
+          if (this.onChannelChange) {
+            this.onChannelChange(node.data.deviceId)
+          }
         })
     },
     addChannelFormDevice: function(id, node) {
@@ -337,7 +339,7 @@ export default {
         for (let i = 0; i < rows.length; i++) {
           deviceIds.push(rows[i].id)
         }
-        this.$store.dispatch('commonChanel/addDeviceToGroup', {
+        this.$store.dispatch('group/add', {
           parentId: node.data.deviceId,
           businessGroup: node.data.businessGroup,
           deviceIds: deviceIds
@@ -347,7 +349,10 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            this.$emit('onChannelChange', node.data.deviceId)
+            if (this.onChannelChange) {
+              this.onChannelChange()
+            }
+            console.log(node)
             node.loaded = false
             node.expand()
           }).finally(() => {
@@ -367,7 +372,9 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            this.$emit('onChannelChange', node.data.deviceId)
+            if (this.onChannelChange) {
+              this.onChannelChange()
+            }
             node.loaded = false
             node.expand()
           }).finally(() => {

web/src/views/common/RegionTree.vue

@@ -131,7 +131,7 @@ export default {
     GbChannelSelect,
     VueEasyTree, regionEdit, gbDeviceSelect
   },
-  props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
+  props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
   data() {
     return {
       props: {
@@ -331,7 +331,6 @@ 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) {
@@ -352,7 +351,9 @@ export default {
             showClose: true,
             message: '保存成功'
           })
-          this.$emit('onChannelChange', node.data.deviceId)
+          if (this.onChannelChange) {
+            this.onChannelChange()
+          }
           node.loaded = false
           node.expand()
         }).catch(function(error) {
@@ -374,7 +375,9 @@ export default {
               showClose: true,
               message: '保存成功'
             })
-            this.$emit('onChannelChange', node.data.deviceId)
+            if (this.onChannelChange) {
+              this.onChannelChange(node.data.deviceId)
+            }
             node.loaded = false
             node.expand()
           }).catch(function(error) {