merge

src/views/demo/onlineform/formCall/index.vue

@@ -526,12 +526,7 @@
         if (rows.length == 0) {
           return createMessage.warn('请选择一条数据查看详情');
         }
-<<<<<<< HEAD
-
         console.log("DetailsRow",formConfig,rows);
-=======
-        console.log('DetailsRow', rows);
->>>>>>> 2d727b56b33f5b20ec09e72b777cfa6a88e157e9
         let toProps = {
           isDetail: true,
           isUpdate: false,
@@ -548,41 +543,12 @@
           openShowFormModal.value = true;
 
           // 根据ids获取图斑
-<<<<<<< HEAD
+
           try{
             console.log("formConfig",formConfig);
             handlerShowGeomtrys(formConfig,rows[0])
           }catch(e){
             createMessage.error("当前数据没有图斑！");
-=======
-          try {
-            let getGeomPrams: GeomParams = {
-              TableName: 'drone_shp_data',
-              FieldName: 'geom',
-              // FieldValue:row[].split(","),
-              FiledValue: [1315, 1308],
-            };
-            getGeom(getGeomPrams).then((res) => {
-              let geoms = [];
-              if (res) {
-                if (res.items?.length > 0) {
-                  res.items.forEach((item, index) => {
-                    let 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('当前数据没有图斑！');
-              }
-            });
-          } catch (e) {
-            createMessage.error('当前数据没有图斑！');
->>>>>>> 2d727b56b33f5b20ec09e72b777cfa6a88e157e9
           }
         } else {
           openModal(true, toProps);
@@ -597,7 +563,7 @@
     }
   };
 
-<<<<<<< HEAD
+
   async function handlerShowGeomtrys(currentNode,rows){
 
     let info = currentNode.value.schemas?.find((item,index)=>{
@@ -656,8 +622,6 @@
     }
   }
 
-=======
->>>>>>> 2d727b56b33f5b20ec09e72b777cfa6a88e157e9
   function handleSelect(selectedKeys: any, selected: any) {
     const rel = selected.node.dataRef;
     const obj: any = {};