Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/components/MapboxMaps/MapComponent.vue

@@ -198,7 +198,7 @@
             },
             measurePolygonOptions:{    
             }
-        }),"top-left")
+        }),"top-right")
       });
     });
     // 销毁地图
@@ -233,7 +233,7 @@
           }
         }
       } else {
-        // 如果没找到数据 则添加到数组
+        // 如果没找到数据则添加到数组
         geojson.geojson.features.push(feature);
       }
       // 自动将数据返回给父组件
@@ -696,12 +696,18 @@
       padding: 10px;
       top: 15px;
       left: 15px;
-      background: #ffffff;
-      border-radius: 12px;
+      background: rgba(13, 16, 18,0.5);
+      border-radius: 14px 1px 14px 1px;
     }
 
     .layer-control-center p {
       margin: 0px;
+      float:left;
+      color:#fff!important;
+    }
+
+    .layer-control-center .ant-checkbox-wrapper{
+      color:#fff!important;
     }
 
     .draw-control-center {
@@ -799,11 +805,12 @@
     .jas-ctrl-measure{
         position:relative;
         top:6px;
-        left:190px;
+        right:10px;
     }
 
     .jas-ctrl-measure-item{
         height:22px;
+        color: #fff;
     }
   </style>
   

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

@@ -645,13 +645,6 @@
         };
 
         // 设置geom保存表单
-        geometryForm.value = {
-          tablename:"drone_shp_data",
-          guidFieldName:"relid",
-          geometryFieldName:"geom",
-          data:[],
-        }
-        console.log("geometryForm",geometryForm);
       }
     
       paramsId.value = res.formScheme.id;
@@ -837,12 +830,6 @@
         console.log("mapgeoms",item);
       })
 
-      let addForm = {
-        "tableName": "drone_shp_data",
-        "guidFieldName": "id",
-        "geometryFieldName": "geom",
-        "data": []
-      }
     }
     // Edit
     if(status == "Edit"){

src/views/demo/workflow/task/process/audit.vue

@@ -26,6 +26,7 @@
                 <MapboxMap
                   :mapConfig="mapConfig"
                   @handlerDrawComplete="handlerDrawComplete"
+                  @mapOnLoad="onMapboxLoad"
                   ref="MapboxComponent"
                 />
               </div>
@@ -97,7 +98,6 @@
                   labelAlign="left"
                   :label-col="2"
                   :wrapper-col="22"
-                  
                 >
                   <!-- <a-form-item :label="auditNameVal" /> -->
                   <a-form-item :label="auditNameVal">
@@ -329,7 +329,7 @@
     designerData.task = data.task;
     let content = JSON.parse(data.scheme.content);
     let wfData = content.wfData;
-    console.log(wfData);
+    console.log("wfData",wfData);
     const finishedTaskSet = Array.from(new Set(data.flowViewer.finishedTaskSet));
     finishedTaskSet.forEach((item) => {
       wfData.forEach((element) => {
@@ -338,8 +338,8 @@
         }
       });
     });
+    
     const auditNode = wfData.find((t) => t.id == data.task.unitId);
-    console.log(auditNode);
     if (auditNode.auditTitle) {
       auditTitleVal.value = auditNode.auditTitle;
     }
@@ -354,13 +354,10 @@
     if (auditNode.isInherit) {
       currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
       mapConfig.value = currentNode.mapConfig;
-      if(mapConfig.value?.isShowMap){
-        handlerShowGeomtrys();
-      }
+      if(mapConfig.value?.isShowMap){}
     } else {
       currentNode = auditNode;
     }
-    console.log(currentNode);
     if (currentNode.authFields.length > 0) {
       formVisble.value = true;
     } else if (currentNode.formUrl) {
@@ -756,36 +753,72 @@
   }
 
 
-  function handlerShowGeomtrys(){
-    // 根据ids获取图斑
-    try{
-      let getGeomPrams = {
-        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
+  async function handlerShowGeomtrys(currentNode){
+
+    let info = currentNode.authFields?.find((item,index)=>{
+      return item.component == "MapGeom"
+    })
+    let layer:string="";
+    // let layer:string="drone_shp_data";
+    if(info){
+      layer = info?.mapSetData?.chooseLayer
+    }
+    if(!layer){
+      createMessage.error("图斑未绑定图层服务！");
+      return;
+    }
+
+    let geomfiledValue = info.field.toLowerCase();
+
+    let gids = "";
+
+    try {
+       await formBoxRef.value.getForm().then(res=>{
+        gids = res[geomfiledValue];  
+            // 根据ids获取图斑
+        if(gids){
+          try{
+            let getGeomPrams = {
+              TableName:layer,
+              FieldName:"gid",
+              FieldValue:gids,
+              page:1,
+              limit:999,
+              key:null,
+            }
+            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.geometry
+                    }
+                    geoms.push(geom);
+                  })
+                }
+                // MapboxComponent.value.handlerDraw(status,mapgemoList.value, false);
+                MapboxComponent.value.handlerDraw("Details",geoms, false)
+              }else{
+                createMessage.error("当前数据没有图斑！");
               }
-              geoms.push(geom);
             })
+          }catch(e){
+            createMessage.error("当前数据没有图斑！");
           }
-          // MapboxComponent.value.handlerDraw(status,mapgemoList.value, false);
-          MapboxComponent.value.handlerDraw("Detail",geoms, false)
         }else{
           createMessage.error("当前数据没有图斑！");
         }
       })
-    }catch(e){
-      createMessage.error("当前数据没有图斑！");
+    }catch{
+      createMessage.error("获取图斑数据失败！");
     }
+
+
+  }
+  function onMapboxLoad(){
+    handlerShowGeomtrys(designerData.formCurrentNode);
   }
   // 驳回到指定节点
   async function rejectHandleOk() {