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

# Conflicts:
#	.gitignore

src/api/api.ts

@@ -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获取医院详情

src/api/hospitals.ts

@@ -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')
 }
 

src/component/rain-earthquake/detail-panels/HospitalComponent.vue

@@ -49,7 +49,7 @@
   // 获取钩子函数
   const { field, getDisasterIcon } = useHospitalPoint();
 
-  $api.hospitals.getBasePoins().then((res) => {
+  $api.hospitals.getBasePoints().then((res) => {
     hospitalPoints.value = res.data;
   });
 

src/component/rain-earthquake/function-child/around-analysis/SearchComponent.vue

@@ -1,6 +1,8 @@
 <!-- 搜索组件 -->
 <template>
-  <div></div>
+  <div>
+    搜索
+  </div>
 </template>
 
 <script lang="ts"></script>