Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

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

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()
+      }
     }
   }
 }

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

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