diff --git a/.env.development b/.env.development index b8ccd8b..fbcc74b 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_APP_NAME=后台管理(开发环境) -#VITE_API_URL=http://127.0.0.1:9200/api +VITE_API_URL=http://127.0.0.1:9200/api #VITE_SERVER_API_URL=http://127.0.0.1:8000/api diff --git a/src/api/shop/shopStoreFence/index.ts b/src/api/shop/shopStoreFence/index.ts new file mode 100644 index 0000000..d61414f --- /dev/null +++ b/src/api/shop/shopStoreFence/index.ts @@ -0,0 +1,105 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { ShopStoreFence, ShopStoreFenceParam } from './model'; + +/** + * 分页查询黄家明_电子围栏 + */ +export async function pageShopStoreFence(params: ShopStoreFenceParam) { + const res = await request.get>>( + '/shop/shop-store-fence/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询黄家明_电子围栏列表 + */ +export async function listShopStoreFence(params?: ShopStoreFenceParam) { + const res = await request.get>( + '/shop/shop-store-fence', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加黄家明_电子围栏 + */ +export async function addShopStoreFence(data: ShopStoreFence) { + const res = await request.post>( + '/shop/shop-store-fence', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改黄家明_电子围栏 + */ +export async function updateShopStoreFence(data: ShopStoreFence) { + const res = await request.put>( + '/shop/shop-store-fence', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除黄家明_电子围栏 + */ +export async function removeShopStoreFence(id?: number) { + const res = await request.delete>( + '/shop/shop-store-fence/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除黄家明_电子围栏 + */ +export async function removeBatchShopStoreFence(data: (number | undefined)[]) { + const res = await request.delete>( + '/shop/shop-store-fence/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询黄家明_电子围栏 + */ +export async function getShopStoreFence(id: number) { + const res = await request.get>( + '/shop/shop-store-fence/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/shopStoreFence/model/index.ts b/src/api/shop/shopStoreFence/model/index.ts new file mode 100644 index 0000000..633164d --- /dev/null +++ b/src/api/shop/shopStoreFence/model/index.ts @@ -0,0 +1,43 @@ +import type { PageParam } from '@/api'; + +/** + * 黄家明_电子围栏 + */ +export interface ShopStoreFence { + // 自增ID + id?: number; + // 围栏名称 + name?: string; + // 类型 0圆形 1方形 + type?: number; + // 定位 + location?: string; + // 经度 + longitude?: string; + // 纬度 + latitude?: string; + // 区域 + district?: string; + // 电子围栏轮廓 + points?: string; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 状态, 0正常, 1冻结 + status?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 黄家明_电子围栏搜索条件 + */ +export interface ShopStoreFenceParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/shop/shopWarehouse/index.ts b/src/api/shop/shopStoreWarehouse/index.ts similarity index 58% rename from src/api/shop/shopWarehouse/index.ts rename to src/api/shop/shopStoreWarehouse/index.ts index 8c999c6..7c0aeef 100644 --- a/src/api/shop/shopWarehouse/index.ts +++ b/src/api/shop/shopStoreWarehouse/index.ts @@ -1,13 +1,13 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; -import type { ShopWarehouse, ShopWarehouseParam } from './model'; +import type { ShopStoreWarehouse, ShopStoreWarehouseParam } from './model'; /** * 分页查询仓库 */ -export async function pageShopWarehouse(params: ShopWarehouseParam) { - const res = await request.get>>( - '/shop/shop-warehouse/page', +export async function pageShopStoreWarehouse(params: ShopStoreWarehouseParam) { + const res = await request.get>>( + '/shop/shop-store-warehouse/page', { params } @@ -21,9 +21,9 @@ export async function pageShopWarehouse(params: ShopWarehouseParam) { /** * 查询仓库列表 */ -export async function listShopWarehouse(params?: ShopWarehouseParam) { - const res = await request.get>( - '/shop/shop-warehouse', +export async function listShopStoreWarehouse(params?: ShopStoreWarehouseParam) { + const res = await request.get>( + '/shop/shop-store-warehouse', { params } @@ -37,9 +37,9 @@ export async function listShopWarehouse(params?: ShopWarehouseParam) { /** * 添加仓库 */ -export async function addShopWarehouse(data: ShopWarehouse) { +export async function addShopStoreWarehouse(data: ShopStoreWarehouse) { const res = await request.post>( - '/shop/shop-warehouse', + '/shop/shop-store-warehouse', data ); if (res.data.code === 0) { @@ -51,9 +51,9 @@ export async function addShopWarehouse(data: ShopWarehouse) { /** * 修改仓库 */ -export async function updateShopWarehouse(data: ShopWarehouse) { +export async function updateShopStoreWarehouse(data: ShopStoreWarehouse) { const res = await request.put>( - '/shop/shop-warehouse', + '/shop/shop-store-warehouse', data ); if (res.data.code === 0) { @@ -65,9 +65,9 @@ export async function updateShopWarehouse(data: ShopWarehouse) { /** * 删除仓库 */ -export async function removeShopWarehouse(id?: number) { +export async function removeShopStoreWarehouse(id?: number) { const res = await request.delete>( - '/shop/shop-warehouse/' + id + '/shop/shop-store-warehouse/' + id ); if (res.data.code === 0) { return res.data.message; @@ -78,9 +78,9 @@ export async function removeShopWarehouse(id?: number) { /** * 批量删除仓库 */ -export async function removeBatchShopWarehouse(data: (number | undefined)[]) { +export async function removeBatchShopStoreWarehouse(data: (number | undefined)[]) { const res = await request.delete>( - '/shop/shop-warehouse/batch', + '/shop/shop-store-warehouse/batch', { data } @@ -94,9 +94,9 @@ export async function removeBatchShopWarehouse(data: (number | undefined)[]) { /** * 根据id查询仓库 */ -export async function getShopWarehouse(id: number) { - const res = await request.get>( - '/shop/shop-warehouse/' + id +export async function getShopStoreWarehouse(id: number) { + const res = await request.get>( + '/shop/shop-store-warehouse/' + id ); if (res.data.code === 0 && res.data.data) { return res.data.data; diff --git a/src/api/shop/shopWarehouse/model/index.ts b/src/api/shop/shopStoreWarehouse/model/index.ts similarity index 78% rename from src/api/shop/shopWarehouse/model/index.ts rename to src/api/shop/shopStoreWarehouse/model/index.ts index 4b96a81..33be13d 100644 --- a/src/api/shop/shopWarehouse/model/index.ts +++ b/src/api/shop/shopStoreWarehouse/model/index.ts @@ -3,7 +3,7 @@ import type { PageParam } from '@/api'; /** * 仓库 */ -export interface ShopWarehouse { +export interface ShopStoreWarehouse { // 自增ID id?: number; // 仓库名称 @@ -18,12 +18,12 @@ export interface ShopWarehouse { realName?: string; // 联系电话 phone?: string; - // 省份 + // 所在省份 province?: string; - // 城市 - city: undefined, - // 区域 - region: undefined, + // 所在城市 + city?: string; + // 所在辖区 + region?: string; // 经纬度 lngAndLat?: string; // 用户ID @@ -34,8 +34,6 @@ export interface ShopWarehouse { sortNumber?: number; // 是否删除 isDelete?: number; - // 状态 - status?: number; // 租户id tenantId?: number; // 创建时间 @@ -47,7 +45,7 @@ export interface ShopWarehouse { /** * 仓库搜索条件 */ -export interface ShopWarehouseParam extends PageParam { +export interface ShopStoreWarehouseParam extends PageParam { id?: number; keywords?: string; } diff --git a/src/views/shop/shopStoreFence/components/shopStoreFenceEdit.vue b/src/views/shop/shopStoreFence/components/shopStoreFenceEdit.vue new file mode 100644 index 0000000..8e828cf --- /dev/null +++ b/src/views/shop/shopStoreFence/components/shopStoreFenceEdit.vue @@ -0,0 +1,245 @@ + + + + diff --git a/src/views/shop/shopStoreWarehouse/components/search.vue b/src/views/shop/shopStoreWarehouse/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/shop/shopStoreWarehouse/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/shop/shopStoreWarehouse/index.vue b/src/views/shop/shopStoreWarehouse/index.vue new file mode 100644 index 0000000..391c849 --- /dev/null +++ b/src/views/shop/shopStoreWarehouse/index.vue @@ -0,0 +1,241 @@ + + + + + + +