diff --git a/.env b/.env index 53551f7..d7c0406 100644 --- a/.env +++ b/.env @@ -12,4 +12,4 @@ VITE_PRO_PATH = 'https://demo.mtruning.club' VITE_APP_TENANT_ENABLE=true # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/modules.xml b/.idea/modules.xml index 8190180..e3f69a1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/yudao-ui-go-view.iml b/.idea/yudao-ui-go-view.iml deleted file mode 100644 index 0c8867d..0000000 --- a/.idea/yudao-ui-go-view.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index f927e64..e6fa458 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -51,6 +51,7 @@ const vChartRef = ref() //动态获取json注册地图 const getGeojson = (regionId: string) => { return new Promise(resolve => { + debugger import(`./mapGeojson/${regionId}.json`).then(data => { registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} }) resolve(true) @@ -64,6 +65,7 @@ registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, spe // 进行更换初始化地图 如果为china 单独处理 const registerMapInitAsync = async () => { await nextTick() + debugger if (props.chartConfig.option.mapRegion.adcode != 'china') { await getGeojson(props.chartConfig.option.mapRegion.adcode) } else { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 37a4aca..794a051 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -56,18 +56,18 @@ :model="formInline" :rules="rules" > - - - - - + + + + + + + + + + + +