From 10a4b2cefa492e230f144d55f0650027af2081c1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 16 Aug 2021 11:03:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E4=B8=8B=E9=92=BB?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponent.vue | 8 ++++++--
 frontend/src/views/chart/view/ChartEdit.vue            | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index e0b487b5f7..8a78a069d7 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -166,24 +166,28 @@ export default {
       this.myEcharts(chart_option)
     },
     registerDynamicMap(areaCode) {
+      this.downOrUp = true
       if (this.$store.getters.geoMap[areaCode]) {
-        this.downOrUp = true
         const json = this.$store.getters.geoMap[areaCode]
         this.$echarts.registerMap('MAP', json)
+        console.log('开始切换地图：' + areaCode)
         return
       }
       geoJson(areaCode).then(res => {
-        this.downOrUp = true
         this.$echarts.registerMap('MAP', res)
+        console.log('开始切换地图：' + areaCode)
         this.$store.dispatch('map/setGeo', {
           key: areaCode,
           value: res
         })
+      }).catch(() => {
+        this.downOrUp = true
       })
     },
 
     initMapChart(geoJson, chart) {
       if (!this.$echarts.getMap('MAP') || !this.downOrUp) {
+        console.log('开始初始化地图：')
         this.$echarts.registerMap('MAP', geoJson)
       }
       // this.$echarts.getMap('MAP') || this.$echarts.registerMap('MAP', geoJson)
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 70ac9bd746..abf33cb007 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1457,9 +1457,11 @@ export default {
       const currentNode = this.findEntityByCode(aCode || this.view.customAttr.areaCode, this.places)
       if (currentNode && currentNode.children && currentNode.children.length > 0) {
         const nextNode = currentNode.children.find(item => item.name === name)
+        if (!nextNode || !nextNode.code) return null
         // this.view.customAttr.areaCode = nextNode.code
         this.currentAcreaNode = nextNode
         this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
+        return nextNode
       }
     },
     // 根据地名获取areaCode

From 7bd5f3dc0fa939425b9c23384fbb299ec1dc6b81 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 16 Aug 2021 11:18:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BEcode=EF=BC=8Cjson?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V19__area_mapping.sql        | 36 +++++++++----------
 frontend/src/views/chart/view/ChartEdit.vue   | 13 +++++--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V19__area_mapping.sql b/backend/src/main/resources/db/migration/V19__area_mapping.sql
index c137c0b5b0..d01a96813f 100644
--- a/backend/src/main/resources/db/migration/V19__area_mapping.sql
+++ b/backend/src/main/resources/db/migration/V19__area_mapping.sql
@@ -3182,24 +3182,24 @@ INSERT INTO `area_mapping` VALUES (3011, '台湾省', '710000', '台湾省', '71
 INSERT INTO `area_mapping` VALUES (3012, '台湾省', '710000', '台湾省', '710000', '苗栗县', '717000');
 INSERT INTO `area_mapping` VALUES (3013, '台湾省', '710000', '台湾省', '710000', '南投县', '718000');
 INSERT INTO `area_mapping` VALUES (3014, '台湾省', '710000', '台湾省', '710000', '台北市', '719000');
-INSERT INTO `area_mapping` VALUES (3015, '香港特别行政区', '810000', '香港特别行政区', '810100', '中西区', '810101');
-INSERT INTO `area_mapping` VALUES (3016, '香港特别行政区', '810000', '香港特别行政区', '810100', '东区', '810102');
-INSERT INTO `area_mapping` VALUES (3017, '香港特别行政区', '810000', '香港特别行政区', '810100', '九龙城区', '810103');
-INSERT INTO `area_mapping` VALUES (3018, '香港特别行政区', '810000', '香港特别行政区', '810100', '观塘区', '810104');
-INSERT INTO `area_mapping` VALUES (3019, '香港特别行政区', '810000', '香港特别行政区', '810100', '南区', '810105');
-INSERT INTO `area_mapping` VALUES (3020, '香港特别行政区', '810000', '香港特别行政区', '810100', '深水埗区', '810106');
-INSERT INTO `area_mapping` VALUES (3021, '香港特别行政区', '810000', '香港特别行政区', '810100', '湾仔区', '810107');
-INSERT INTO `area_mapping` VALUES (3022, '香港特别行政区', '810000', '香港特别行政区', '810100', '黄大仙区', '810108');
-INSERT INTO `area_mapping` VALUES (3023, '香港特别行政区', '810000', '香港特别行政区', '810100', '油尖旺区', '810109');
-INSERT INTO `area_mapping` VALUES (3024, '香港特别行政区', '810000', '香港特别行政区', '810100', '离岛区', '810110');
-INSERT INTO `area_mapping` VALUES (3025, '香港特别行政区', '810000', '香港特别行政区', '810100', '葵青区', '810111');
-INSERT INTO `area_mapping` VALUES (3026, '香港特别行政区', '810000', '香港特别行政区', '810100', '北区', '810112');
-INSERT INTO `area_mapping` VALUES (3027, '香港特别行政区', '810000', '香港特别行政区', '810100', '西贡区', '810113');
-INSERT INTO `area_mapping` VALUES (3028, '香港特别行政区', '810000', '香港特别行政区', '810100', '沙田区', '810114');
-INSERT INTO `area_mapping` VALUES (3029, '香港特别行政区', '810000', '香港特别行政区', '810100', '屯门区', '810115');
-INSERT INTO `area_mapping` VALUES (3030, '香港特别行政区', '810000', '香港特别行政区', '810100', '大埔区', '810116');
-INSERT INTO `area_mapping` VALUES (3031, '香港特别行政区', '810000', '香港特别行政区', '810100', '荃湾区', '810117');
-INSERT INTO `area_mapping` VALUES (3032, '香港特别行政区', '810000', '香港特别行政区', '810100', '元朗区', '810118');
+INSERT INTO `area_mapping` VALUES (3015, '香港特别行政区', '810000', '香港特别行政区', '810100', '中西区', '810001');
+INSERT INTO `area_mapping` VALUES (3016, '香港特别行政区', '810000', '香港特别行政区', '810100', '东区', '810002');
+INSERT INTO `area_mapping` VALUES (3017, '香港特别行政区', '810000', '香港特别行政区', '810100', '九龙城区', '810003');
+INSERT INTO `area_mapping` VALUES (3018, '香港特别行政区', '810000', '香港特别行政区', '810100', '观塘区', '810004');
+INSERT INTO `area_mapping` VALUES (3019, '香港特别行政区', '810000', '香港特别行政区', '810100', '南区', '810005');
+INSERT INTO `area_mapping` VALUES (3020, '香港特别行政区', '810000', '香港特别行政区', '810100', '深水埗区', '810006');
+INSERT INTO `area_mapping` VALUES (3021, '香港特别行政区', '810000', '香港特别行政区', '810100', '湾仔区', '810007');
+INSERT INTO `area_mapping` VALUES (3022, '香港特别行政区', '810000', '香港特别行政区', '810100', '黄大仙区', '810008');
+INSERT INTO `area_mapping` VALUES (3023, '香港特别行政区', '810000', '香港特别行政区', '810100', '油尖旺区', '810009');
+INSERT INTO `area_mapping` VALUES (3024, '香港特别行政区', '810000', '香港特别行政区', '810100', '离岛区', '810010');
+INSERT INTO `area_mapping` VALUES (3025, '香港特别行政区', '810000', '香港特别行政区', '810100', '葵青区', '810011');
+INSERT INTO `area_mapping` VALUES (3026, '香港特别行政区', '810000', '香港特别行政区', '810100', '北区', '810012');
+INSERT INTO `area_mapping` VALUES (3027, '香港特别行政区', '810000', '香港特别行政区', '810100', '西贡区', '810013');
+INSERT INTO `area_mapping` VALUES (3028, '香港特别行政区', '810000', '香港特别行政区', '810100', '沙田区', '810014');
+INSERT INTO `area_mapping` VALUES (3029, '香港特别行政区', '810000', '香港特别行政区', '810100', '屯门区', '810015');
+INSERT INTO `area_mapping` VALUES (3030, '香港特别行政区', '810000', '香港特别行政区', '810100', '大埔区', '810016');
+INSERT INTO `area_mapping` VALUES (3031, '香港特别行政区', '810000', '香港特别行政区', '810100', '荃湾区', '810017');
+INSERT INTO `area_mapping` VALUES (3032, '香港特别行政区', '810000', '香港特别行政区', '810100', '元朗区', '810018');
 INSERT INTO `area_mapping` VALUES (3033, '澳门特别行政区', '820000', '澳门特别行政区', '820000', '澳门特别行政区', '820000');
 COMMIT;
 
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index abf33cb007..532e947917 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1406,9 +1406,16 @@ export default {
 
     chartClick(param) {
       if (this.drillClickDimensionList.length < this.view.drillFields.length - 1) {
-        this.chart.type === 'map' && this.sendToChildren(param)
-        this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
-        this.getData(this.param.id)
+        // const isSwitch = (this.chart.type === 'map' && this.sendToChildren(param))
+        if (this.chart.type === 'map') {
+          if (this.sendToChildren(param)) {
+            this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
+            this.getData(this.param.id)
+          }
+        } else {
+          this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
+          this.getData(this.param.id)
+        }
       }
     },
 

From 3e6b61a88c9b68dbd839681f180a892767226f23 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 16 Aug 2021 11:48:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BEcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V19__area_mapping.sql        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V19__area_mapping.sql b/backend/src/main/resources/db/migration/V19__area_mapping.sql
index d01a96813f..388374710a 100644
--- a/backend/src/main/resources/db/migration/V19__area_mapping.sql
+++ b/backend/src/main/resources/db/migration/V19__area_mapping.sql
@@ -3183,23 +3183,23 @@ INSERT INTO `area_mapping` VALUES (3012, '台湾省', '710000', '台湾省', '71
 INSERT INTO `area_mapping` VALUES (3013, '台湾省', '710000', '台湾省', '710000', '南投县', '718000');
 INSERT INTO `area_mapping` VALUES (3014, '台湾省', '710000', '台湾省', '710000', '台北市', '719000');
 INSERT INTO `area_mapping` VALUES (3015, '香港特别行政区', '810000', '香港特别行政区', '810100', '中西区', '810001');
-INSERT INTO `area_mapping` VALUES (3016, '香港特别行政区', '810000', '香港特别行政区', '810100', '东区', '810002');
-INSERT INTO `area_mapping` VALUES (3017, '香港特别行政区', '810000', '香港特别行政区', '810100', '九龙城区', '810003');
-INSERT INTO `area_mapping` VALUES (3018, '香港特别行政区', '810000', '香港特别行政区', '810100', '观塘区', '810004');
-INSERT INTO `area_mapping` VALUES (3019, '香港特别行政区', '810000', '香港特别行政区', '810100', '南区', '810005');
+INSERT INTO `area_mapping` VALUES (3016, '香港特别行政区', '810000', '香港特别行政区', '810100', '湾仔区', '810002');
+INSERT INTO `area_mapping` VALUES (3017, '香港特别行政区', '810000', '香港特别行政区', '810100', '东区', '810003');
+INSERT INTO `area_mapping` VALUES (3018, '香港特别行政区', '810000', '香港特别行政区', '810100', '南区', '810004');
+INSERT INTO `area_mapping` VALUES (3019, '香港特别行政区', '810000', '香港特别行政区', '810100', '油尖旺区', '810005');
 INSERT INTO `area_mapping` VALUES (3020, '香港特别行政区', '810000', '香港特别行政区', '810100', '深水埗区', '810006');
-INSERT INTO `area_mapping` VALUES (3021, '香港特别行政区', '810000', '香港特别行政区', '810100', '湾仔区', '810007');
+INSERT INTO `area_mapping` VALUES (3021, '香港特别行政区', '810000', '香港特别行政区', '810100', '九龙城区', '810007');
 INSERT INTO `area_mapping` VALUES (3022, '香港特别行政区', '810000', '香港特别行政区', '810100', '黄大仙区', '810008');
-INSERT INTO `area_mapping` VALUES (3023, '香港特别行政区', '810000', '香港特别行政区', '810100', '油尖旺区', '810009');
-INSERT INTO `area_mapping` VALUES (3024, '香港特别行政区', '810000', '香港特别行政区', '810100', '离岛区', '810010');
-INSERT INTO `area_mapping` VALUES (3025, '香港特别行政区', '810000', '香港特别行政区', '810100', '葵青区', '810011');
-INSERT INTO `area_mapping` VALUES (3026, '香港特别行政区', '810000', '香港特别行政区', '810100', '北区', '810012');
-INSERT INTO `area_mapping` VALUES (3027, '香港特别行政区', '810000', '香港特别行政区', '810100', '西贡区', '810013');
-INSERT INTO `area_mapping` VALUES (3028, '香港特别行政区', '810000', '香港特别行政区', '810100', '沙田区', '810014');
-INSERT INTO `area_mapping` VALUES (3029, '香港特别行政区', '810000', '香港特别行政区', '810100', '屯门区', '810015');
-INSERT INTO `area_mapping` VALUES (3030, '香港特别行政区', '810000', '香港特别行政区', '810100', '大埔区', '810016');
-INSERT INTO `area_mapping` VALUES (3031, '香港特别行政区', '810000', '香港特别行政区', '810100', '荃湾区', '810017');
-INSERT INTO `area_mapping` VALUES (3032, '香港特别行政区', '810000', '香港特别行政区', '810100', '元朗区', '810018');
+INSERT INTO `area_mapping` VALUES (3023, '香港特别行政区', '810000', '香港特别行政区', '810100', '观塘区', '810009');
+INSERT INTO `area_mapping` VALUES (3024, '香港特别行政区', '810000', '香港特别行政区', '810100', '荃湾区', '810010');
+INSERT INTO `area_mapping` VALUES (3025, '香港特别行政区', '810000', '香港特别行政区', '810100', '屯门区', '810011');
+INSERT INTO `area_mapping` VALUES (3026, '香港特别行政区', '810000', '香港特别行政区', '810100', '元朗区', '810012');
+INSERT INTO `area_mapping` VALUES (3027, '香港特别行政区', '810000', '香港特别行政区', '810100', '北区', '810013');
+INSERT INTO `area_mapping` VALUES (3028, '香港特别行政区', '810000', '香港特别行政区', '810100', '大埔区', '810014');
+INSERT INTO `area_mapping` VALUES (3029, '香港特别行政区', '810000', '香港特别行政区', '810100', '西贡区', '810015');
+INSERT INTO `area_mapping` VALUES (3030, '香港特别行政区', '810000', '香港特别行政区', '810100', '沙田区', '810016');
+INSERT INTO `area_mapping` VALUES (3031, '香港特别行政区', '810000', '香港特别行政区', '810100', '葵青区', '810017');
+INSERT INTO `area_mapping` VALUES (3032, '香港特别行政区', '810000', '香港特别行政区', '810100', '离岛区', '810018');
 INSERT INTO `area_mapping` VALUES (3033, '澳门特别行政区', '820000', '澳门特别行政区', '820000', '澳门特别行政区', '820000');
 COMMIT;