feat: 新功能
This commit is contained in:
parent
9c180e646e
commit
79230e002c
2
.env
2
.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
|
||||
|
5
.idea/.gitignore
vendored
5
.idea/.gitignore
vendored
@ -1,5 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
@ -2,7 +2,7 @@
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<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>
|
||||
</component>
|
||||
</project>
|
@ -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>
|
@ -51,6 +51,7 @@ const vChartRef = ref<typeof VChart>()
|
||||
//动态获取json注册地图
|
||||
const getGeojson = (regionId: string) => {
|
||||
return new Promise<boolean>(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 {
|
||||
|
@ -56,18 +56,18 @@
|
||||
:model="formInline"
|
||||
:rules="rules"
|
||||
>
|
||||
<n-form-item path="tenantId" v-if="tenantEnable ==='true'">
|
||||
<n-input
|
||||
v-model:value="formInline.tenantName"
|
||||
:placeholder="$t('global.form_tenant')"
|
||||
>
|
||||
<template #prefix>
|
||||
<n-icon size="18">
|
||||
<TvOutlineIcon></TvOutlineIcon>
|
||||
</n-icon>
|
||||
</template>
|
||||
</n-input>
|
||||
</n-form-item>
|
||||
<!-- <n-form-item path="tenantId" v-if="tenantEnable ==='true'">-->
|
||||
<!-- <n-input-->
|
||||
<!-- v-model:value="formInline.tenantName"-->
|
||||
<!-- :placeholder="$t('global.form_tenant')"-->
|
||||
<!-- >-->
|
||||
<!-- <template #prefix>-->
|
||||
<!-- <n-icon size="18">-->
|
||||
<!-- <TvOutlineIcon></TvOutlineIcon>-->
|
||||
<!-- </n-icon>-->
|
||||
<!-- </template>-->
|
||||
<!-- </n-input>-->
|
||||
<!-- </n-form-item>-->
|
||||
<n-form-item path="username">
|
||||
<n-input
|
||||
v-model:value="formInline.username"
|
||||
|
Loading…
Reference in New Issue
Block a user