diff --git a/src/api/formrender/index.ts b/src/api/formrender/index.ts index 02c85bbe..c824e622 100644 --- a/src/api/formrender/index.ts +++ b/src/api/formrender/index.ts @@ -22,7 +22,10 @@ enum Api { export const getFormsDesignData = (params: AccountParams) => defHttp.get({ url: Api.GETDESIGNDATA, params }); export const getFormsPageData = (params: AccountParams) => - defHttp.post({ url: Api.GETFORMPAGEDATA + params.id, params }); + defHttp.post({ + url: Api.GETFORMPAGEDATA + params.id + '&mid=' + params.mid, + params, + }); export const saveFormsData = (params: SaveFormsParams) => defHttp.post({ url: Api.SAVEFORMDATA, params }); export const delFormsData = (params: DeleteFormsParams) => @@ -33,5 +36,7 @@ export const delFormsData = (params: DeleteFormsParams) => export const getFormsDataDetail = (params: DeleteFormsParams) => defHttp.get({ url: Api.GETFORMSDATADETAIL, params }); export const getFormData = (params: getFormsParams) => { - return defHttp.get({ url: `${Api.getFormData}?id=${params.id}&key=${params.key}&keyValue=${params.keyValue}` }); -} + return defHttp.get({ + url: `${Api.getFormData}?id=${params.id}&key=${params.key}&keyValue=${params.keyValue}`, + }); +}; diff --git a/src/api/formrender/model/index.ts b/src/api/formrender/model/index.ts index 0b324744..458eb09f 100644 --- a/src/api/formrender/model/index.ts +++ b/src/api/formrender/model/index.ts @@ -22,6 +22,7 @@ export interface AccountParams { limit?: string; code?: any; rows?: string; + mid?: string; } export interface SaveFormsParams { schemeId?: string; diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue index 85eeb627..e491a9cc 100644 --- a/src/views/demo/onlineform/formCall/index.vue +++ b/src/views/demo/onlineform/formCall/index.vue @@ -90,7 +90,7 @@ getFormData, } from '@/api/formrender/index'; import { getOutKeyList } from '@/api/formdesign/index'; - import { getGeom } from '@/api/sys/layerManagement' + import { getGeom } from '@/api/sys/layerManagement'; import { PageWrapper } from '@/components/Page'; import { cloneDeep } from 'lodash-es'; import { IFormConfig } from '../../form-design/typings/v-form-component'; @@ -126,6 +126,7 @@ const treeTitle: any = ref('树形'); const treeVisible: any = ref(false); const paramsId: any = ref(); + const codeId: any = ref(); const designData: any = ref(); const searchInfo: any = ref({}); const addParamsArr: any = ref([]); @@ -144,7 +145,7 @@ const infoUseMainTableData = ref({}); // 展示的图层列表 const layers = reactive(); - const geometryForm = ref({}) + const geometryForm = ref({}); // 图层定位数据 const location = reactive([118.556717, 35.80391]); @@ -274,6 +275,7 @@ delete querys.limit; console.log('querys', querys); var temp = { + mid: codeId.value, id: paramsId.value, paginationInputDto: { page: data.page, @@ -388,11 +390,11 @@ afterSaveEvent: '', changeDataEvent: '', }); - + interface GeomParams { - TableName:string; - FieldName:string; - FiledValue:Array; + TableName: string; + FieldName: string; + FiledValue: Array; } const handleClickForm = (status) => { @@ -482,7 +484,11 @@ if (haveMap.value) { showFormModalData.value = toProps; openShowFormModal.value = true; - MapboxComponent.value.handlerDraw(status,mapgemoList.value,mapSetData.value?.isAllowEditPolygon,); + MapboxComponent.value.handlerDraw( + status, + mapgemoList.value, + mapSetData.value?.isAllowEditPolygon, + ); } else { openModal(true, toProps); } @@ -519,7 +525,7 @@ if (rows.length == 0) { return createMessage.warn('请选择一条数据查看详情'); } - console.log("DetailsRow",rows); + console.log('DetailsRow', rows); let toProps = { isDetail: true, isUpdate: false, @@ -536,38 +542,34 @@ openShowFormModal.value = true; // 根据ids获取图斑 - try{ - let getGeomPrams:GeomParams = { - TableName:"drone_shp_data", - FieldName:"geom", + try { + let getGeomPrams: GeomParams = { + TableName: 'drone_shp_data', + FieldName: 'geom', // FieldValue:row[].split(","), - FiledValue:[1315,1308], - } - getGeom(getGeomPrams).then(res=>{ + FiledValue: [1315, 1308], + }; + getGeom(getGeomPrams).then((res) => { let geoms = []; - if(res){ - if(res.items?.length>0){ - res.items.forEach((item,index)=>{ + if (res) { + if (res.items?.length > 0) { + res.items.forEach((item, index) => { let geom = { - key:item.gid, - mapgeom:item.geom - } + key: item.gid, + mapgeom: item.geom, + }; geoms.push(geom); - }) + }); } // MapboxComponent.value.handlerDraw(status,mapgemoList.value, false); - MapboxComponent.value.handlerDraw(status,geoms, false) - }else{ - createMessage.error("当前数据没有图斑！"); + MapboxComponent.value.handlerDraw(status, geoms, false); + } else { + createMessage.error('当前数据没有图斑！'); } - }) - }catch(e){ - createMessage.error("当前数据没有图斑！"); + }); + } catch (e) { + createMessage.error('当前数据没有图斑！'); } - - - - } else { openModal(true, toProps); } @@ -581,7 +583,6 @@ } }; - function handleSelect(selectedKeys: any, selected: any) { const rel = selected.node.dataRef; const obj: any = {}; @@ -646,14 +647,14 @@ // 设置geom保存表单 geometryForm.value = { - tablename:"drone_shp_data", - guidFieldName:"relid", - geometryFieldName:"geom", - data:[], - } - console.log("geometryForm",geometryForm); + tablename: 'drone_shp_data', + guidFieldName: 'relid', + geometryFieldName: 'geom', + data: [], + }; + console.log('geometryForm', geometryForm); } - + codeId.value = res.entity.id; paramsId.value = res.formScheme.id; btnList.value = columnObj.table.btns; if (columnObj.table.columns) { @@ -759,22 +760,26 @@ .then((res) => { let childTableName = designData.value.db.find((item) => item.type === 'chlid')?.name; let mainTableName = designData.value.db.find((item) => item.type === 'main').name; - let subTableData = res[childTableName]? res[childTableName].map((item) => { - return { - ...item, - key: uuidv4(), - MapGeom: item.mapgeom, - }; - }): []; + let subTableData = res[childTableName] + ? res[childTableName].map((item) => { + return { + ...item, + key: uuidv4(), + MapGeom: item.mapgeom, + }; + }) + : []; formData.value = [...subTableData]; - infoUseSubTableData.value = res[childTableName]? res[childTableName].map((item) => { - return { - ...item, - key: uuidv4(), - }; - }): []; + infoUseSubTableData.value = res[childTableName] + ? res[childTableName].map((item) => { + return { + ...item, + key: uuidv4(), + }; + }) + : []; res[mainTableName].forEach((item) => { infoUseMainTableData.value = { ...infoUseMainTableData.value, ...item }; @@ -782,7 +787,7 @@ mapgemoList.value = formData.value; - console.log("formData333",formData); + console.log('formData333', formData); }) .catch((err) => { console.log('err', err); @@ -798,12 +803,11 @@ } }); mapgemoList.value = [...geom]; - - // 处理geom保存表单 - mapgemoList.value?.forEach((item,index)=>{ - geometryForm.value?.data.push(item.value); - }) + // 处理geom保存表单 + mapgemoList.value?.forEach((item, index) => { + geometryForm.value?.data.push(item.value); + }); }; const mapOnLoad = (map) => { // const test_url = @@ -827,33 +831,30 @@ }; // 处理图斑数据新增、编辑、删除 - const handlerDealGeomtry = (status:string,features=null,) => { - + const handlerDealGeomtry = (status: string, features = null) => { // Add - if(status == "Add"){ - let geoms:string[] = []; + if (status == 'Add') { + let geoms: string[] = []; - mapgemoList.value?.forEach((item,index)=>{ - console.log("mapgeoms",item); - }) + mapgemoList.value?.forEach((item, index) => { + console.log('mapgeoms', item); + }); let addForm = { - "tableName": "drone_shp_data", - "guidFieldName": "id", - "geometryFieldName": "geom", - "data": [] - } + tableName: 'drone_shp_data', + guidFieldName: 'id', + geometryFieldName: 'geom', + data: [], + }; } // Edit - if(status == "Edit"){ - + if (status == 'Edit') { } // Delete - if(status == "Delete"){ - - } - } + if (status == 'Delete') { + } + };