From 7bd5f3dc0fa939425b9c23384fbb299ec1dc6b81 Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 16 Aug 2021 11:18:48 +0800 Subject: [PATCH] =?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) + } } },