dianliang/lanan-ui-go-view
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新功能

Browse Source
This commit is contained in:
Vinjor 2024-08-09 09:26:37 +08:00
parent 9c180e646e
commit 79230e002c
6 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -12,4 +12,4 @@ VITE_PRO_PATH = 'https://demo.mtruning.club'
VITE_APP_TENANT_ENABLE=true VITE_APP_TENANT_ENABLE=true
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_APP_CAPTCHA_ENABLE=false

5
.idea/.gitignore vendored
View File

@ -1,5 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/

2
.idea/modules.xml
View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/yudao-ui-go-view.iml" filepath="$PROJECT_DIR$/.idea/yudao-ui-go-view.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/lanan-ui-go-view.iml" filepath="$PROJECT_DIR$/.idea/lanan-ui-go-view.iml" />
</modules> </modules>
</component> </component>
</project> </project>

12
.idea/yudao-ui-go-view.iml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

2
src/packages/components/Charts/Maps/MapBase/index.vue
View File

@ -51,6 +51,7 @@ const vChartRef = ref<typeof VChart>()
//动态获取json注册地图 //动态获取json注册地图
const getGeojson = (regionId: string) => { const getGeojson = (regionId: string) => {
return new Promise<boolean>(resolve => { return new Promise<boolean>(resolve => {
debugger
import(`./mapGeojson/${regionId}.json`).then(data => { import(`./mapGeojson/${regionId}.json`).then(data => {
registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} }) registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
resolve(true) resolve(true)
@ -64,6 +65,7 @@ registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, spe
// 进行更换初始化地图 如果为china 单独处理 // 进行更换初始化地图 如果为china 单独处理
const registerMapInitAsync = async () => { const registerMapInitAsync = async () => {
await nextTick() await nextTick()
debugger
if (props.chartConfig.option.mapRegion.adcode != 'china') { if (props.chartConfig.option.mapRegion.adcode != 'china') {
await getGeojson(props.chartConfig.option.mapRegion.adcode) await getGeojson(props.chartConfig.option.mapRegion.adcode)
} else { } else {

24
src/views/login/index.vue
View File

@ -56,18 +56,18 @@
:model="formInline" :model="formInline"
:rules="rules" :rules="rules"
> >
<n-form-item path="tenantId" v-if="tenantEnable ==='true'"> <!-- <n-form-item path="tenantId" v-if="tenantEnable ==='true'">-->
<n-input <!-- <n-input-->
v-model:value="formInline.tenantName" <!-- v-model:value="formInline.tenantName"-->
:placeholder="$t('global.form_tenant')" <!-- :placeholder="$t('global.form_tenant')"-->
> <!-- >-->
<template #prefix> <!-- <template #prefix>-->
<n-icon size="18"> <!-- <n-icon size="18">-->
<TvOutlineIcon></TvOutlineIcon> <!-- <TvOutlineIcon></TvOutlineIcon>-->
</n-icon> <!-- </n-icon>-->
</template> <!-- </template>-->
</n-input> <!-- </n-input>-->
</n-form-item> <!-- </n-form-item>-->
<n-form-item path="username"> <n-form-item path="username">
<n-input <n-input
v-model:value="formInline.username" v-model:value="formInline.username"