diff --git a/src/api/platform/common/controller/org.ts b/src/api/platform/common/controller/org.ts index fa66841..440d460 100644 --- a/src/api/platform/common/controller/org.ts +++ b/src/api/platform/common/controller/org.ts @@ -10,7 +10,7 @@ enum Api { del = '/common_proxy/common/org/remove' } -export const listOrg = (params: OrgParams) => defHttp.get({url: Api.list, params}, { isReturnResultResponse: true }); +export const listOrg = (params?: Partial) => defHttp.get({url: Api.list, params}, { isReturnResultResponse: true }); export const addOrg = (params: Partial) => defHttp.post({ url: Api.save, data: params }); diff --git a/src/api/platform/common/entity/hospital.ts b/src/api/platform/common/entity/hospital.ts index 031bedc..8b9ca1d 100644 --- a/src/api/platform/common/entity/hospital.ts +++ b/src/api/platform/common/entity/hospital.ts @@ -14,7 +14,7 @@ export interface Hospital extends CommonEntity { contactPhone: string; contactTitle: string; payment: string; - addressIds: string; + regionIds: string; detailAddress: string; status: string; mapOrientation: number; diff --git a/src/api/platform/common/entity/org.ts b/src/api/platform/common/entity/org.ts index a181c67..a9d2995 100644 --- a/src/api/platform/common/entity/org.ts +++ b/src/api/platform/common/entity/org.ts @@ -11,12 +11,12 @@ export interface Org extends CommonEntity{ contactPhone: string; contactTitle: string; addressNames: string; - addressIds: string; + regionIds: string; detailAddress: string; status: string; + mapOrientation: number; mapLng: number; mapLat: number; - mapNotify: string; } export type OrgResult = R; diff --git a/src/api/platform/core/entity/user.ts b/src/api/platform/core/entity/user.ts index cea885a..340b631 100644 --- a/src/api/platform/core/entity/user.ts +++ b/src/api/platform/core/entity/user.ts @@ -37,6 +37,8 @@ export interface User extends CommonEntity { userName: string; // 昵称 nickName: string; + // 用户类型 + userType: string; // 头像 avatar: string; // 所属部门ID diff --git a/src/components/AMap/index.ts b/src/components/AMapDesigner/index.ts similarity index 100% rename from src/components/AMap/index.ts rename to src/components/AMapDesigner/index.ts diff --git a/src/components/AMap/src/Amap.vue b/src/components/AMapDesigner/src/Amap.vue similarity index 61% rename from src/components/AMap/src/Amap.vue rename to src/components/AMapDesigner/src/Amap.vue index 6645a47..8cd09bb 100644 --- a/src/components/AMap/src/Amap.vue +++ b/src/components/AMapDesigner/src/Amap.vue @@ -1,10 +1,38 @@