diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts
index 8f976942..8c61ea83 100644
--- a/src/api/demo/system.ts
+++ b/src/api/demo/system.ts
@@ -68,8 +68,8 @@ enum Api {
DeleteNotice = '/api/DroneCaseinfo/UpdateDelMessage',
UserList = '/api/users/load',
// StatisticalList='/api/DroneCaseinfo/CaseSynthesisCensus',
- StatisticalList = '/api/DroneCaseinfo/CaseSynthesisCensusSingle',
- StatisticalListExport = '/api/DroneCaseinfo/ExportCaseSynthesisCensusStreet',
+ StatisticalList = '/api/DroneCaseInfoSingle/CaseSynthesisCensusSingle',
+ StatisticalListExport = '/api/DroneCaseInfoSingle/ExportCaseSynthesisCensusStreet',
LoadNoticeDetail = '/api/DroneCaseinfo/LoadMessage',
getChildrenTree = '/api/Orgs/LoadChildren',
GetUserRoles = '/api/Roles/UserRoles',
diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue
index 0f226cec..3257d929 100644
--- a/src/components/MapboxMaps/MapComponent.vue
+++ b/src/components/MapboxMaps/MapComponent.vue
@@ -283,6 +283,13 @@
});
});
+ function handlerLayerChange(){
+ var allLayers = map.getStyle().layers;
+ allLayers.forEach(function(layer){
+ map.moveLayer('detailsLayer', layer.id);
+ map.moveLayer('detailsLayerLine', layer.id);
+ });
+ }
// 地图图层控制
const handlerLoadMapLayer = ()=>{
if(switchLayerControler){
@@ -336,18 +343,18 @@
let layers = {
name:item.name,
layer: layer,
- fixed:true,
- zoom:0,
- easeToOptions:{},
- mutex:false,
- mutexIdentity:generateUUID(),
+ fixed:false,
+ // zoom:0,
+ easeToOptions:{},
active:false,
backgroundImage:VITE_GLOB_API_URL_VAR.value+image,
backgroundImageActive:"",
- onVisibleChange:(visible:boolean)=>{}
+ onVisibleChange:(visible:boolean)=>{
+ handlerLayerChange()
+ }
}
baseLayers.push(layers)
- })
+ });
configlayers["地图底图"] = {
"collapse": !0,
"defaultCollapsed": !0,
@@ -357,7 +364,8 @@
// 图层管理工具
switchLayerControler = new SwitchLayerControl({
name:"图层管理" ,
- position:"top-left",
+ position:"top-left",
+ showToTop:true,
layerGroups:configlayers
});
map.addControl(switchLayerControler,"top-left");
@@ -828,22 +836,22 @@
type:"geojson",
data:geojson
})
- map.addLayer(
- {
- "id": "detailsLayer",
- "type": "fill",
- "source": "detailsSource",
- 'layout':{
+ // map.addLayer(
+ // {
+ // "id": "detailsLayer",
+ // "type": "fill",
+ // "source": "detailsSource",
+ // 'layout':{
- },
- 'paint': {
- //填充颜色
- 'fill-color': '#3badc9',
- //透明度设置
- "fill-opacity": 0.4,
- }
- }
- )
+ // },
+ // 'paint': {
+ // //填充颜色
+ // 'fill-color': '#fcf003',
+ // //透明度设置
+ // "fill-opacity": 0.5,
+ // }
+ // }
+ // )
map.addLayer(
{
"id": "detailsLayerLine",
@@ -853,8 +861,8 @@
},
'paint': {
- 'line-color': '#3badc9',
- 'line-width': 2
+ 'line-color': '#fcf003',
+ 'line-width': 3
}
}
)
diff --git a/src/components/Upload/src/components/ImageUpload.vue b/src/components/Upload/src/components/ImageUpload.vue
index b3d6b2cc..6871d80f 100644
--- a/src/components/Upload/src/components/ImageUpload.vue
+++ b/src/components/Upload/src/components/ImageUpload.vue
@@ -25,11 +25,9 @@
diff --git a/src/views/demo/bootstraps/auditinfo/index.vue b/src/views/demo/bootstraps/auditinfo/index.vue
index c06257a7..f99b3220 100644
--- a/src/views/demo/bootstraps/auditinfo/index.vue
+++ b/src/views/demo/bootstraps/auditinfo/index.vue
@@ -48,7 +48,7 @@
const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
const MapboxComponent = ref();
const mapConfig = ref({ isShowMap: false });
-
+
function onMapboxLoad():void {
getConfig({code:"mapsetting"}).then(res=>{
mapConfig.value = JSON.parse(res.codeValue)
@@ -127,7 +127,7 @@
}
function changeTask(record) {
if(record?.geomid){
- handlerGetMapConfigByFormId(record.processcode);
+ // handlerGetMapConfigByFormId(record.processcode);
let val = record.geomid
let getGeomPrams = {
TableName: 'drone_shp_data ',
diff --git a/src/views/demo/bootstraps/mapconfig/index.vue b/src/views/demo/bootstraps/mapconfig/index.vue
index 7633fba7..597cfc63 100644
--- a/src/views/demo/bootstraps/mapconfig/index.vue
+++ b/src/views/demo/bootstraps/mapconfig/index.vue
@@ -197,8 +197,11 @@
getConfig({code:"mapsetting"}).then(res=>{
mapConfig.value = JSON.parse(res.codeValue)
})
+/*
+*/
+
// const mapConfig = reactive({
// baseConfig:{
// state:true,
@@ -340,345 +343,7 @@
// config
// const config: any = inject('formConfig');
- const config = {
- "layoutType": 1,
- "queryType": 1,
- "left": {
- "title": "左侧树形",
- "colField": "",
- "dataType": "1",
- "dataIdKey": "",
- "dataPIdKey": "",
- "dataValueKey": "",
- "dataLabelKey": "",
- "colNames": [],
- "options": [],
- "dataCode": ""
- },
- "table": {
- "isPage": true,
- "columns": [
- {
- "key": "_input_39",
- "label": "案件编号",
- "value": "案件编号",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_15",
- "label": "案件类型",
- "value": "案件类型",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_3",
- "label": "县区",
- "value": "县区",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_10",
- "label": "乡镇",
- "value": "乡镇",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_11",
- "label": "村/社区",
- "value": "村/社区",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_520d1d8068f4492ea8c42ce9bb61b3cf",
- "label": "农用地面积",
- "value": "农用地面积",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_16",
- "label": "案件描述",
- "value": "案件描述",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_7",
- "label": "判读人",
- "value": "判读人",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_input_44",
- "label": "下发时间",
- "value": "下发时间",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- },
- {
- "key": "_card_group_155",
- "label": "判定结果",
- "value": "判定结果",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "CardGroup"
- },
- {
- "key": "_input_21f2a3b800f8402c8161bb767bce5e75",
- "label": "审核人",
- "value": "审核人",
- "width": 120,
- "align": "left",
- "isMinWidth": false,
- "component": "Input"
- }
- ],
- "querys": [
- {
- "key": "_input_39",
- "label": "案件编号",
- "type": "Input",
- "componentProps": {
- "type": "text",
- "dataTable": "drone_caseinfo_single",
- "fieldName": "case_no"
- }
- },
- {
- "key": "_input_15",
- "label": "案件类型",
- "type": "Input",
- "componentProps": {
- "type": "text",
- "dataTable": "drone_caseinfo_single",
- "fieldName": "typename"
- }
- },
- {
- "key": "_input_3",
- "label": "县区",
- "type": "Input",
- "componentProps": {
- "type": "text",
- "dataTable": "drone_caseinfo_single",
- "fieldName": "countyname"
- }
- },
- {
- "key": "_input_10",
- "label": "乡镇",
- "type": "Input",
- "componentProps": {
- "type": "text",
- "dataTable": "drone_caseinfo_single",
- "fieldName": "streetname"
- }
- },
- {
- "key": "_input_11",
- "label": "村/社区",
- "type": "Input",
- "componentProps": {
- "type": "text",
- "dataTable": "drone_caseinfo_single",
- "fieldName": "communityname"
- }
- }
- ],
- "btns": [
- {
- "label": "导出",
- "id": "Export",
- "prop": "Export",
- "icon": "ant-design:download-outlined",
- "isRowBtn": false,
- "class": "primary",
- "sort": 2
- },
- {
- "label": "编辑",
- "id": "Edit",
- "prop": "Edit",
- "icon": "ant-design:edit-outlined",
- "isRowBtn": true,
- "class": "success",
- "sort": 3,
- "isWFlow": true,
- "wFlowCode": "0000001"
- },
- {
- "label": "详情",
- "id": "Details",
- "prop": "Details",
- "icon": "ant-design:align-center-outlined",
- "isRowBtn": true,
- "class": "default",
- "sort": 5
- }
- ],
- "maps": {
- "chooseLayer": "drone_shp_data",
- "isAllowEditPolygon": false,
- "isEnablePostionJump": true,
- "width": 50,
- "baseLayers": [
- {
- "id": "1e0be368-1276-4d31-8b33-db837ea7b319",
- "name": "天地图注记",
- "description": "天地图注记",
- "type": 0,
- "image": "20240703\\2024070317544709510069.png",
- "relationTable": null,
- "createTime": "2024-07-03 17:54:49",
- "createId": "-1",
- "srid": null,
- "status": 1,
- "shpPath": null,
- "style": "{\"id\":\"be961f7a-2d92-4c66-8365-dba8904d14dd\",\"type\":\"raster\",\"source\":{\"type\":\"raster\",\"tiles\":[\"https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=b6585bc41ee16251dbe6b1af64f375d9\"],\"tileSize\":256},\"layout\":{\"visibility\":\"none\"},\"paint\":{}}",
- "vectorType": null,
- "attributeTable": null,
- "attributeField": null,
- "checked": false
- },
- {
- "id": "252d2353-22a3-4a62-8d8c-fb37e8254abd",
- "name": "费县高清影像服务",
- "description": "费县高清影像服务",
- "type": 0,
- "image": "20240704\\2024070410225737170146.jpg",
- "relationTable": null,
- "createTime": "2024-07-04 10:22:59",
- "createId": "-1",
- "srid": null,
- "status": 1,
- "shpPath": null,
- "style": "{\"id\":\"293577da-a17d-4c6f-bab3-6dd669bad36c\",\"type\":\"raster\",\"source\":{\"type\":\"raster\",\"tiles\":[\"http://60.213.14.14:8060/geoserver/feixian/wms?service=WMS&version=1.1.0&request=GetMap&layers=feixian:yingxiang&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE\"],\"tileSize\":256},\"layout\":{\"visibility\":\"visible\"},\"paint\":{}}",
- "vectorType": null,
- "attributeTable": null,
- "attributeField": null,
- "checked": false
- }
- ],
- "layers": [
- {
- "name": "违建图斑",
- "layers": [
- {
- "id": "5ce51b19-5db3-47b9-a48f-e0a389294426",
- "name": "天空地案件图斑-关联属性",
- "description": "天空地案件图斑-关联属性",
- "type": 0,
- "image": null,
- "relationTable": "drone_shp_data",
- "createTime": "2024-06-21 15:50:26",
- "createId": "-1",
- "srid": "EPSG:4326",
- "status": 1,
- "shpPath": null,
- "style": "{\n \"id\": \"5ce51b19-5db3-47b9-a48f-e0a389294426\",\n \"type\": \"line\",\n \"source\": {\n \"type\": \"vector\",\n \"tiles\": [\n \"http://192.168.10.102:9023/api/DroneCaseinfo/QueryVectorTileByTable?z={z}&x={x}&y={y}&table=drone_shp_data&field=\\\"gid\\\",\"\n ],\n \"minzoom\": 1,\n \"maxzoom\": 20\n },\n \"source-layer\": \"drone_shp_data\",\n \"layout\": {\n \"line-join\": \"round\",\n \"line-cap\": \"round\"\n },\n \"paint\": {\n \"line-color\": \"#408eff\",\n \"line-width\": 3\n },\n \"state\": {\n \"attributeField\": \"geomid\",\n \"attributeTable\": \"drone_caseinfo_single\"\n }\n}",
- "vectorType": "面",
- "attributeTable": "drone_caseinfo_single",
- "attributeField": "geomid",
- "checked": false
- }
- ]
- }
- ],
- "isShowMap": true,
- "mode": "3D",
- "angle": 0,
- "zoom": 13,
- "minZoom": 1,
- "maxZoom": 18,
- "center": "117,39"
- },
- "sidx": "",
- "isDESC": false
- },
- "btns": [
- {
- "label": "新增",
- "id": "Add",
- "prop": "Add",
- "icon": "ant-design:plus-outlined",
- "isRowBtn": false,
- "class": "primary",
- "sort": 0
- },
- {
- "label": "导入",
- "id": "Import",
- "prop": "Import",
- "icon": "ant-design:upload-outlined",
- "isRowBtn": false,
- "class": "success",
- "sort": 1
- },
- {
- "label": "导出",
- "id": "Export",
- "prop": "Export",
- "icon": "ant-design:download-outlined",
- "isRowBtn": false,
- "class": "primary",
- "sort": 2
- },
- {
- "label": "编辑",
- "id": "Edit",
- "prop": "Edit",
- "icon": "ant-design:edit-outlined",
- "isRowBtn": true,
- "class": "success",
- "sort": 3,
- "isWFlow": true,
- "wFlowCode": "0000001"
- },
- {
- "label": "删除",
- "id": "Delete",
- "prop": "Delete",
- "icon": "ant-design:delete-outlined",
- "isRowBtn": true,
- "class": "error",
- "sort": 4
- },
- {
- "label": "详情",
- "id": "Details",
- "prop": "Details",
- "icon": "ant-design:align-center-outlined",
- "isRowBtn": true,
- "class": "default",
- "sort": 5
- }
- ]
-};
+ const config = {}
// const mapConfig = ref(config.table.maps);
diff --git a/src/views/demo/layermanagement/components/VisitSource.vue b/src/views/demo/layermanagement/components/VisitSource.vue
new file mode 100644
index 00000000..56a2e318
--- /dev/null
+++ b/src/views/demo/layermanagement/components/VisitSource.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
diff --git a/src/views/demo/layermanagement/index.vue b/src/views/demo/layermanagement/index.vue
new file mode 100644
index 00000000..713fae45
--- /dev/null
+++ b/src/views/demo/layermanagement/index.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index 3fab7675..a25fb2ae 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -607,6 +607,8 @@
// showFormModalData.value = toProps;
// openShowFormModal.value = true;
// 根据ids获取图斑
+ console.log(rows);
+ console.log("formConfig");
try {
console.log('formConfig', formConfig);
handlerShowGeomtrys(formConfig, rows[0]);
diff --git a/src/views/demo/system/layermanagement/components/VisitSource.vue b/src/views/demo/system/layermanagement/components/VisitSource.vue
new file mode 100644
index 00000000..56a2e318
--- /dev/null
+++ b/src/views/demo/system/layermanagement/components/VisitSource.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
diff --git a/src/views/demo/system/layermanagement/index.vue b/src/views/demo/system/layermanagement/index.vue
new file mode 100644
index 00000000..713fae45
--- /dev/null
+++ b/src/views/demo/system/layermanagement/index.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+