Merge remote-tracking branch 'origin/main' into dsz

# Conflicts:
#	.gitignore
This commit is contained in:
zhuangzhuang2000
2026-04-27 12:47:26 +08:00
9 changed files with 10 additions and 4282 deletions
+1
View File
@@ -25,3 +25,4 @@ dist-ssr
/docs/
auto-imports.d.ts
components.d.ts
pnpm-lock.yaml
-10
View File
@@ -1,10 +0,0 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
// biome-ignore lint: disable
export {}
declare global {
}
-32
View File
@@ -1,32 +0,0 @@
/* eslint-disable */
// @ts-nocheck
// biome-ignore lint: disable
// oxlint-disable
// ------
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
ElButton: typeof import('element-plus/es')['ElButton']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}
export interface GlobalDirectives {
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}
+1
View File
@@ -28,6 +28,7 @@
"devDependencies": {
"@tsconfig/node22": "^22.0.2",
"@types/node": "^24.12.2",
"@types/proj4": "^2.19.0",
"@vitejs/plugin-vue": "^6.0.5",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.6.0",
-4234
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -2,7 +2,7 @@ import type { DisasterType } from '@/types/common/DisasterType.ts'
import { getSm2PublicKey } from './crypto'
import { getBasePoins as getHiddenDangerBasePoints, getPointDetailById as getHiddenDangerPointDetailById} from './hidden-danger-spots'
import { getBasePoins as getRiskBasePoints, getPointDetailById as getRiskPointDetailById} from './risk-spots'
import { getBasePoins as getHospitalsBasePoints, getPointDetailById as getHospitalsPointDetailById} from './hospitals'
import { getBasePoints as getHospitalsBasePoints, getPointDetailById as getHospitalsPointDetailById} from './hospitals'
import { getBasePoints as getDangerousSourceBasePoints, getPointDetailById as getDangerousSourcePointDetailById} from './dangerous-source'
import { getBasePoints as getEmergencyShelterBasePoints, getPointDetailById as getEmergencyShelterPointDetailById} from './emergency-shelter'
import { getBasePoints as getFirefighterBasePoints, getPointDetailById as getFirefighterPointDetailById} from './firefighter'
@@ -71,7 +71,7 @@ export const $api = {
* 获取所有基础医院
* @returns 医院数据数组
*/
getBasePoins: (): Promise<ApiResponse<XianHospitals[]>> => getHospitalsBasePoints(),
getBasePoints: (): Promise<ApiResponse<XianHospitals[]>> => getHospitalsBasePoints(),
/**
* 根据id获取医院详情
+1 -1
View File
@@ -6,7 +6,7 @@ import httpInstance from "@/utils/request/http"
* 获取医院基础数据
* @returns 医院数据数组
*/
export const getBasePoins = (): Promise<ApiResponse<XianHospitals[]>> => {
export const getBasePoints = (): Promise<ApiResponse<XianHospitals[]>> => {
return httpInstance.get('/hospitals/base-points')
}
@@ -49,7 +49,7 @@
// 获取钩子函数
const { field, getDisasterIcon } = useHospitalPoint();
$api.hospitals.getBasePoins().then((res) => {
$api.hospitals.getBasePoints().then((res) => {
hospitalPoints.value = res.data;
});
@@ -1,6 +1,8 @@
<!-- 搜索组件 -->
<template>
<div></div>
<div>
搜索
</div>
</template>
<script lang="ts"></script>