diff --git a/public/del.png b/public/del.png index 1ec7e9ad..37e51d3c 100644 Binary files a/public/del.png and b/public/del.png differ diff --git a/public/point.png b/public/point.png index c19cf2c4..3d75a234 100644 Binary files a/public/point.png and b/public/point.png differ diff --git a/src/api/demo/formScheme.ts b/src/api/demo/formScheme.ts index e524c355..be858f39 100644 --- a/src/api/demo/formScheme.ts +++ b/src/api/demo/formScheme.ts @@ -252,7 +252,7 @@ export function AddTable(params) { dbColumnName: 'geom', dataType: 'geometry', length: 0, - columnDescription: 'geom', + columnDescription: '地图组件', isNullable: 0, isIdentity: 0, isPrimarykey: 0, diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue index 0d7ebb69..391dc904 100644 --- a/src/components/FormViewer/index.vue +++ b/src/components/FormViewer/index.vue @@ -16,6 +16,7 @@ formVerison: String, formRelationId: String, flowFormData: Object, + instanceInfo: String, }); props.formConfig.forEach((element) => { element.componentProps.disabled = !element.disabled; @@ -44,10 +45,11 @@ } } async function getFormDetail() { + var instance = JSON.parse(props.instanceInfo); const querys = { id: props.formVerison, key: keyValue.value, - keyValue: props.processId, + keyValue: instance.pkeyValue, }; const data = await functionGetFormDataFormScheme(querys); let obj = new Object(); diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index 1d1d169b..7021f849 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -93,12 +93,10 @@ let nextMapControl: Array = reactive([]); nextMapControl = props.control ? props.control.map((item) => { - console.log('item::: ', item); return MapControlConfig[item]; }) : []; - console.log('nextMapControl::: ', nextMapControl); // 定义地图容器 let map: Map; @@ -141,12 +139,10 @@ // 设置绘图监听事件 map.on("draw.create", function (e) { - console.log(e); drawGeojson.geojson = e.features[0] }); map.on("draw.update", function (e) { - console.log(e); drawGeojson.geojson = e.features[0] }); @@ -265,7 +261,6 @@ } const handlerCopyFeature = () => { - console.log("selectFeature",selectFeature); popup.remove(); createMessage.success("复制成功!") } @@ -297,7 +292,6 @@ // 图层控制中心 const handlerLayerControler = (layerInfo)=>{ - console.log("layerinfoinfo",layerInfo) if(map.getSource(layerInfo.layer.id)){ if(layerInfo.checked){ map.setLayoutProperty(layerInfo.layer.id, "visibility", "visible"); @@ -320,7 +314,6 @@ // 图斑属性查看 const handlerPreviewFeatureInfo = (e) => { if(e.features){ - console.log("EEEEEEE",e.features[0].layer.id,e.features[0].properties); isOpen.value = true; } } @@ -413,23 +406,32 @@ } const handlerDraw = (feature=null) =>{ - let featureTemp = feature? WktToGeojson(feature): ''; - console.log("传入的WKT:::",featureTemp); + - - let geo = { - type: "FeatureCollection", - features: [ - { - "id": "cd1d93c0e4a6747ff597f190c311d0e3", - "type": "Feature", - "properties": {}, - "geometry": featureTemp + + let geo = {}; + + if(feature==null){ + geo = { + type: "FeatureCollection", + features: [], + } + }else{ + let featureTemp = WktToGeojson(feature); + geo = { + type: "FeatureCollection", + features: [ + { + "id": "cd1d93c0e4a6747ff597f190c311d0e3", + "type": "Feature", + "properties": {}, + "geometry": featureTemp + } + ], } - ], } + - console.log("geo",geo); handlerInitDrawTool(geo) } diff --git a/src/components/MapboxMaps/RightShowInfo/index.vue b/src/components/MapboxMaps/RightShowInfo/index.vue index d3b9b15a..0b5dfe96 100644 --- a/src/components/MapboxMaps/RightShowInfo/index.vue +++ b/src/components/MapboxMaps/RightShowInfo/index.vue @@ -1,9 +1,5 @@