diff --git a/.gitignore b/.gitignore index e6ea2fa1..dc43b46d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ tests/server/static/upload .env.*.local .eslintcache .env +.env.tiankongdi .env.analyze .env.development .env.lindidiaocha diff --git a/src/api/sys/layerManagement.ts b/src/api/sys/layerManagement.ts index 1748f85a..6ac114e1 100644 --- a/src/api/sys/layerManagement.ts +++ b/src/api/sys/layerManagement.ts @@ -1,5 +1,13 @@ import { defHttp } from '@/utils/http/axios'; -import { AddLayerParams,GetLayerListParams,AddGeomParams,GetGeomParams,LoginResultModel, GetUserInfoModel } from './model/layerModel'; +import { + AddLayerParams, + GetLayerListParams, + AddGeomParams, + GetGeomParams, + LoginResultModel, + GetUserInfoModel, + CalTubanAreaModel +} from './model/layerModel'; import { ErrorMessageMode } from '#/axios'; @@ -14,6 +22,8 @@ enum Api { GetLayerList = "/api/ShpLayerSource/LoadPage", AddGeom = "/api/ShpLayerSource/SaveShapeData", GetGeom = "/api/ShpLayerSource/GetShapeData", + CalTubanArea = "/api/DroneCaseInfoSingle/CalTubanArea", + SplitAndCalTubanArea = "/api/DroneCaseInfoSingle/SplitAndCalTubanArea", GetPermCode = '/getPermCode', TestRetry = '/testRetry', Login = '/api/Check/Login', @@ -106,6 +116,26 @@ export function getGeom(params:GetGeomParams) { ) } +export function calTubanArea(params:CalTubanAreaModel){ + return defHttp.post( + { + url: Api.CalTubanArea, + params, + } + ) +} + +export function splitAndCalTubanArea(params:CalTubanAreaModel){ + return defHttp.post( + { + url: Api.SplitAndCalTubanArea, + params, + } + ) +} + + + export function getConfig(params) { return defHttp.get( diff --git a/src/api/sys/model/layerModel.ts b/src/api/sys/model/layerModel.ts index 45206b11..e1411724 100644 --- a/src/api/sys/model/layerModel.ts +++ b/src/api/sys/model/layerModel.ts @@ -33,6 +33,19 @@ export interface GetGeomParams { limit:number, key:string | null, } + +export interface CalTubanAreaModel{ + wktgeom: string | null; + gengdi: number | null, + nongyongdi: number | null, + jibennongtian: number | null, + shengtaihongxian: number | null, + gengdituban:string, + nongyongdituban:string | null, + jibennongtiantuban:string | null, + shengtaihongxiantuban:string | null, + remaintuban:string | null +} export interface RoleInfo { roleName: string; diff --git a/src/api/tiankongdi/index.ts b/src/api/tiankongdi/index.ts index ce630a0b..62c6b45f 100644 --- a/src/api/tiankongdi/index.ts +++ b/src/api/tiankongdi/index.ts @@ -188,7 +188,7 @@ export function rebackzhuantipic(params:{ zhuanti, CaseId }){ params }); } -export function CopyImg(params:string[]){ +export function CopyImg(params: { caseId, images}){ return defHttp.post({ url: Api.CopyImg, data:params, diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue index 295ee3f0..dabb2f52 100644 --- a/src/components/FormViewer/index.vue +++ b/src/components/FormViewer/index.vue @@ -331,7 +331,6 @@ } }, 10); } - console.log(111111111111,cardGroupData.value) } function tabsChange(e) { tabsKey.value = e; diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index 531629a7..83457cd5 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -107,7 +107,29 @@
导入图层分割
- + + + +地类图斑分割
耕地地类分割
+建设用地地类分割
+