diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 49fd5b1..1d8012e 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -688,8 +688,8 @@ "params": [ { "heightfixed": true, - "opacity": 0.6, - "sourceColor": "rgba(255,0,0,1)", + "opacity":1, + "sourceColor": "#FFFF00", "targetColor": "rbga(255,255,255, 0)" } ] @@ -1071,6 +1071,49 @@ }, { + "id": "标段分区", + "key": "ps_watch_area", + "type": "fill", + "paint": { + "fill-color": "rgba(255,255,1,1)", + "fill-opacity": 0.5 + }, + "layout": { + "visibility": "none" + }, + "minzoom": 7, + "maxzoom": 24, + "mType": "geojsonMvt", + "geom_column": "geometrys", + "columns": "id,watch_area_name as name,st_asText(geometrys) as geometry" + }, + { + "id": "标段分区_text", + "key": "ps_watch_area", + "type": "symbol", + "minzoom": 1, + "layout": { + "text-field": "{name}", + "text-font": ["KlokanTech Noto Sans Regular"], + "text-letter-spacing": 0.1, + "text-rotation-alignment": "map", + "text-size": 13, + "text-anchor": "top", + "text-offset": [0,0], + "text-transform": "uppercase", + "visibility": "none" + }, + "paint": { + "text-color": "#22acfa", + "text-halo-color": "rgba(255,255,255,1)", + "text-halo-width": 2 + }, + "mType": "geojsonMvt", + "geom_column": "geometrys_center", + "columns": "id,watch_area_name as name,st_asText(geometrys_center) as geometry" + }, + + { "id": "港渠", "key": "hb_wh_dhgx_gq11", "type": "fill", diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 49fd5b1..1d8012e 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -688,8 +688,8 @@ "params": [ { "heightfixed": true, - "opacity": 0.6, - "sourceColor": "rgba(255,0,0,1)", + "opacity":1, + "sourceColor": "#FFFF00", "targetColor": "rbga(255,255,255, 0)" } ] @@ -1071,6 +1071,49 @@ }, { + "id": "标段分区", + "key": "ps_watch_area", + "type": "fill", + "paint": { + "fill-color": "rgba(255,255,1,1)", + "fill-opacity": 0.5 + }, + "layout": { + "visibility": "none" + }, + "minzoom": 7, + "maxzoom": 24, + "mType": "geojsonMvt", + "geom_column": "geometrys", + "columns": "id,watch_area_name as name,st_asText(geometrys) as geometry" + }, + { + "id": "标段分区_text", + "key": "ps_watch_area", + "type": "symbol", + "minzoom": 1, + "layout": { + "text-field": "{name}", + "text-font": ["KlokanTech Noto Sans Regular"], + "text-letter-spacing": 0.1, + "text-rotation-alignment": "map", + "text-size": 13, + "text-anchor": "top", + "text-offset": [0,0], + "text-transform": "uppercase", + "visibility": "none" + }, + "paint": { + "text-color": "#22acfa", + "text-halo-color": "rgba(255,255,255,1)", + "text-halo-width": 2 + }, + "mType": "geojsonMvt", + "geom_column": "geometrys_center", + "columns": "id,watch_area_name as name,st_asText(geometrys_center) as geometry" + }, + + { "id": "港渠", "key": "hb_wh_dhgx_gq11", "type": "fill", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 2c6dab7..d5e8a4c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -738,36 +738,16 @@ let prevObj = null; const panelDataToMap = (obj) => { let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 - // debugger + debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = [ - "point", - "linestring", - "polygon", - "hb_wh_dhgx_psfq_geometrys", - "hb_wh_dhgx_merge", - ] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) || - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.p_type)[0] || - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_psfq_geometrys", "hb_wh_dhgx_merge",'ps_watch_area_geometrys'].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) || (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = obj.watchAreaName?features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0]:features.filter((i) => i.properties.p_type)[0] || features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0] || features[_.random(0, features.length - 1)]; console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp); - if (feature.properties.p_type && isUp) - return mapClickEvt(undefined, feature.properties, "排水分区"); + if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, "排水分区"); if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); @@ -779,7 +759,7 @@ [bbox[0], bbox[1]], [bbox[2], bbox[3]], ], - { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 } + { padding: 100, offset: [100, 10], maxZoom: 18, pitch: 30,bearing:-9.5, duration: 500 } ); }; const trajectoryToMap = (data) => { @@ -1114,8 +1094,8 @@ map.addGroupLayer(); newfiberMap.map.getCanvas().id = newfiberMap.map.getCanvas().className; mx_map.create(map, { - locateFile: (fileName) => `https://supermap6.wh-nf.cn:8090/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, - fileUrl: 'https://supermap6.wh-nf.cn:8090/resource/v4/kexuedao.dwg.mxweb', + locateFile: (fileName) => `https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, + fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); window.mx_map = mx_map;*/ diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 49fd5b1..1d8012e 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -688,8 +688,8 @@ "params": [ { "heightfixed": true, - "opacity": 0.6, - "sourceColor": "rgba(255,0,0,1)", + "opacity":1, + "sourceColor": "#FFFF00", "targetColor": "rbga(255,255,255, 0)" } ] @@ -1071,6 +1071,49 @@ }, { + "id": "标段分区", + "key": "ps_watch_area", + "type": "fill", + "paint": { + "fill-color": "rgba(255,255,1,1)", + "fill-opacity": 0.5 + }, + "layout": { + "visibility": "none" + }, + "minzoom": 7, + "maxzoom": 24, + "mType": "geojsonMvt", + "geom_column": "geometrys", + "columns": "id,watch_area_name as name,st_asText(geometrys) as geometry" + }, + { + "id": "标段分区_text", + "key": "ps_watch_area", + "type": "symbol", + "minzoom": 1, + "layout": { + "text-field": "{name}", + "text-font": ["KlokanTech Noto Sans Regular"], + "text-letter-spacing": 0.1, + "text-rotation-alignment": "map", + "text-size": 13, + "text-anchor": "top", + "text-offset": [0,0], + "text-transform": "uppercase", + "visibility": "none" + }, + "paint": { + "text-color": "#22acfa", + "text-halo-color": "rgba(255,255,255,1)", + "text-halo-width": 2 + }, + "mType": "geojsonMvt", + "geom_column": "geometrys_center", + "columns": "id,watch_area_name as name,st_asText(geometrys_center) as geometry" + }, + + { "id": "港渠", "key": "hb_wh_dhgx_gq11", "type": "fill", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 2c6dab7..d5e8a4c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -738,36 +738,16 @@ let prevObj = null; const panelDataToMap = (obj) => { let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 - // debugger + debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = [ - "point", - "linestring", - "polygon", - "hb_wh_dhgx_psfq_geometrys", - "hb_wh_dhgx_merge", - ] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) || - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.p_type)[0] || - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_psfq_geometrys", "hb_wh_dhgx_merge",'ps_watch_area_geometrys'].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) || (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = obj.watchAreaName?features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0]:features.filter((i) => i.properties.p_type)[0] || features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0] || features[_.random(0, features.length - 1)]; console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp); - if (feature.properties.p_type && isUp) - return mapClickEvt(undefined, feature.properties, "排水分区"); + if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, "排水分区"); if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); @@ -779,7 +759,7 @@ [bbox[0], bbox[1]], [bbox[2], bbox[3]], ], - { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 } + { padding: 100, offset: [100, 10], maxZoom: 18, pitch: 30,bearing:-9.5, duration: 500 } ); }; const trajectoryToMap = (data) => { @@ -1114,8 +1094,8 @@ map.addGroupLayer(); newfiberMap.map.getCanvas().id = newfiberMap.map.getCanvas().className; mx_map.create(map, { - locateFile: (fileName) => `https://supermap6.wh-nf.cn:8090/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, - fileUrl: 'https://supermap6.wh-nf.cn:8090/resource/v4/kexuedao.dwg.mxweb', + locateFile: (fileName) => `https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, + fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); window.mx_map = mx_map;*/ diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index 4930f9e..ab0c667 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -33,7 +33,7 @@ - + { if(res.code==200){ tabsImg.value=0 @@ -94,6 +95,7 @@ setLayerVisible: { key: "setLayerVisible" }, beansToMap: {key: 'beansToMap',id:["waterlog_point"],colors:['rgba(255,0,0,0.5)']}, removeMapDatas: { key: 'removeMapDatas' }, + panelDataToMap: { key: 'panelDataToMap' }, } function _beansToMap(data) { const {beansToMap,removeMapDatas,setLayerVisible} = events_params; @@ -108,7 +110,7 @@ onMounted(() => { getData() - + //排渍调度 bus.on("showZSdispatch", (e) => { pzData.value = e diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 49fd5b1..1d8012e 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -688,8 +688,8 @@ "params": [ { "heightfixed": true, - "opacity": 0.6, - "sourceColor": "rgba(255,0,0,1)", + "opacity":1, + "sourceColor": "#FFFF00", "targetColor": "rbga(255,255,255, 0)" } ] @@ -1071,6 +1071,49 @@ }, { + "id": "标段分区", + "key": "ps_watch_area", + "type": "fill", + "paint": { + "fill-color": "rgba(255,255,1,1)", + "fill-opacity": 0.5 + }, + "layout": { + "visibility": "none" + }, + "minzoom": 7, + "maxzoom": 24, + "mType": "geojsonMvt", + "geom_column": "geometrys", + "columns": "id,watch_area_name as name,st_asText(geometrys) as geometry" + }, + { + "id": "标段分区_text", + "key": "ps_watch_area", + "type": "symbol", + "minzoom": 1, + "layout": { + "text-field": "{name}", + "text-font": ["KlokanTech Noto Sans Regular"], + "text-letter-spacing": 0.1, + "text-rotation-alignment": "map", + "text-size": 13, + "text-anchor": "top", + "text-offset": [0,0], + "text-transform": "uppercase", + "visibility": "none" + }, + "paint": { + "text-color": "#22acfa", + "text-halo-color": "rgba(255,255,255,1)", + "text-halo-width": 2 + }, + "mType": "geojsonMvt", + "geom_column": "geometrys_center", + "columns": "id,watch_area_name as name,st_asText(geometrys_center) as geometry" + }, + + { "id": "港渠", "key": "hb_wh_dhgx_gq11", "type": "fill", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 2c6dab7..d5e8a4c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -738,36 +738,16 @@ let prevObj = null; const panelDataToMap = (obj) => { let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 - // debugger + debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = [ - "point", - "linestring", - "polygon", - "hb_wh_dhgx_psfq_geometrys", - "hb_wh_dhgx_merge", - ] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) || - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.p_type)[0] || - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_psfq_geometrys", "hb_wh_dhgx_merge",'ps_watch_area_geometrys'].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) || (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = obj.watchAreaName?features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0]:features.filter((i) => i.properties.p_type)[0] || features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0] || features[_.random(0, features.length - 1)]; console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp); - if (feature.properties.p_type && isUp) - return mapClickEvt(undefined, feature.properties, "排水分区"); + if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, "排水分区"); if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); @@ -779,7 +759,7 @@ [bbox[0], bbox[1]], [bbox[2], bbox[3]], ], - { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 } + { padding: 100, offset: [100, 10], maxZoom: 18, pitch: 30,bearing:-9.5, duration: 500 } ); }; const trajectoryToMap = (data) => { @@ -1114,8 +1094,8 @@ map.addGroupLayer(); newfiberMap.map.getCanvas().id = newfiberMap.map.getCanvas().className; mx_map.create(map, { - locateFile: (fileName) => `https://supermap6.wh-nf.cn:8090/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, - fileUrl: 'https://supermap6.wh-nf.cn:8090/resource/v4/kexuedao.dwg.mxweb', + locateFile: (fileName) => `https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, + fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); window.mx_map = mx_map;*/ diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index 4930f9e..ab0c667 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -33,7 +33,7 @@ - + { if(res.code==200){ tabsImg.value=0 @@ -94,6 +95,7 @@ setLayerVisible: { key: "setLayerVisible" }, beansToMap: {key: 'beansToMap',id:["waterlog_point"],colors:['rgba(255,0,0,0.5)']}, removeMapDatas: { key: 'removeMapDatas' }, + panelDataToMap: { key: 'panelDataToMap' }, } function _beansToMap(data) { const {beansToMap,removeMapDatas,setLayerVisible} = events_params; @@ -108,7 +110,7 @@ onMounted(() => { getData() - + //排渍调度 bus.on("showZSdispatch", (e) => { pzData.value = e diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index f5a6749..626047b 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -297,7 +297,7 @@ !(newfiberMap.RainsLayer) && (newfiberMap.RainsLayer = new mapboxgl1.RainsLayer( [114.359445, 30.26976, 114.635417, 30.578213], - rainPicture.value, + [], self => { self.addTo(newfiberMap.map); self.hide(); @@ -339,7 +339,7 @@ stepNum.value++; if (stepNum.value <= 24) { stepLin.value = `${stepNum.value * 4.1666}%`; - newfiberMap.RainsLayer.next() + newfiberMap.RainsLayer.next(hgEndActive.value) timeLoop(); } else { emptyRun(); diff --git a/index.html b/index.html index d21c7fc..f75d9c4 100644 --- a/index.html +++ b/index.html @@ -241,11 +241,15 @@ NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/gl-matrix-min.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxdraw.umd.js', () => NewFiberMapConfig.$import('https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/mxcad.umd.js', - () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js"))) + () => NewFiberMapConfig.$import("https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/ExtendsMapBoxMap.js" + ) + ) + ) ); } } + diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 49fd5b1..1d8012e 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -688,8 +688,8 @@ "params": [ { "heightfixed": true, - "opacity": 0.6, - "sourceColor": "rgba(255,0,0,1)", + "opacity":1, + "sourceColor": "#FFFF00", "targetColor": "rbga(255,255,255, 0)" } ] @@ -1071,6 +1071,49 @@ }, { + "id": "标段分区", + "key": "ps_watch_area", + "type": "fill", + "paint": { + "fill-color": "rgba(255,255,1,1)", + "fill-opacity": 0.5 + }, + "layout": { + "visibility": "none" + }, + "minzoom": 7, + "maxzoom": 24, + "mType": "geojsonMvt", + "geom_column": "geometrys", + "columns": "id,watch_area_name as name,st_asText(geometrys) as geometry" + }, + { + "id": "标段分区_text", + "key": "ps_watch_area", + "type": "symbol", + "minzoom": 1, + "layout": { + "text-field": "{name}", + "text-font": ["KlokanTech Noto Sans Regular"], + "text-letter-spacing": 0.1, + "text-rotation-alignment": "map", + "text-size": 13, + "text-anchor": "top", + "text-offset": [0,0], + "text-transform": "uppercase", + "visibility": "none" + }, + "paint": { + "text-color": "#22acfa", + "text-halo-color": "rgba(255,255,255,1)", + "text-halo-width": 2 + }, + "mType": "geojsonMvt", + "geom_column": "geometrys_center", + "columns": "id,watch_area_name as name,st_asText(geometrys_center) as geometry" + }, + + { "id": "港渠", "key": "hb_wh_dhgx_gq11", "type": "fill", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 2c6dab7..d5e8a4c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -738,36 +738,16 @@ let prevObj = null; const panelDataToMap = (obj) => { let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 - // debugger + debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true }); // debugger; - let features = [ - "point", - "linestring", - "polygon", - "hb_wh_dhgx_psfq_geometrys", - "hb_wh_dhgx_merge", - ] - .map((key) => - newfiberMap.map - .getSource(key) - ._options.data.features.filter( - (i) => - (i.properties.name || "").includes(obj.name) || - (obj.id ? obj.id == i.properties.pid : true) - ) - ) - .flat(); - let feature = - features.filter((i) => i.properties.p_type)[0] || - features.filter((i) => i.properties.name == obj.name)[0] || - features[_.random(0, features.length - 1)]; + let features = ["point", "linestring", "polygon", "hb_wh_dhgx_psfq_geometrys", "hb_wh_dhgx_merge",'ps_watch_area_geometrys'].map((key) => newfiberMap.map.getSource(key)._options.data.features.filter((i) => (i.properties.name || "").includes(obj.name) || (obj.id ? obj.id == i.properties.pid : true))).flat(); + let feature = obj.watchAreaName?features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0]:features.filter((i) => i.properties.p_type)[0] || features.filter((i) => i.properties.name == obj.name && i.properties.id == obj.id)[0] || features[_.random(0, features.length - 1)]; console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp); - if (feature.properties.p_type && isUp) - return mapClickEvt(undefined, feature.properties, "排水分区"); + if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, "排水分区"); if (!feature) return; busEmit(setHighlight.key, [feature]); mapCenterByData(turf.bbox(feature)); @@ -779,7 +759,7 @@ [bbox[0], bbox[1]], [bbox[2], bbox[3]], ], - { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 } + { padding: 100, offset: [100, 10], maxZoom: 18, pitch: 30,bearing:-9.5, duration: 500 } ); }; const trajectoryToMap = (data) => { @@ -1114,8 +1094,8 @@ map.addGroupLayer(); newfiberMap.map.getCanvas().id = newfiberMap.map.getCanvas().className; mx_map.create(map, { - locateFile: (fileName) => `https://supermap6.wh-nf.cn:8090/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, - fileUrl: 'https://supermap6.wh-nf.cn:8090/resource/v4/kexuedao.dwg.mxweb', + locateFile: (fileName) => `https://dhgx12.wh-nf.cn:7081/resource/v4/libs/other/mx_draw/wasm/${mode}/${fileName}`, + fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); window.mx_map = mx_map;*/ diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index 4930f9e..ab0c667 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -33,7 +33,7 @@ - + { if(res.code==200){ tabsImg.value=0 @@ -94,6 +95,7 @@ setLayerVisible: { key: "setLayerVisible" }, beansToMap: {key: 'beansToMap',id:["waterlog_point"],colors:['rgba(255,0,0,0.5)']}, removeMapDatas: { key: 'removeMapDatas' }, + panelDataToMap: { key: 'panelDataToMap' }, } function _beansToMap(data) { const {beansToMap,removeMapDatas,setLayerVisible} = events_params; @@ -108,7 +110,7 @@ onMounted(() => { getData() - + //排渍调度 bus.on("showZSdispatch", (e) => { pzData.value = e diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index f5a6749..626047b 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -297,7 +297,7 @@ !(newfiberMap.RainsLayer) && (newfiberMap.RainsLayer = new mapboxgl1.RainsLayer( [114.359445, 30.26976, 114.635417, 30.578213], - rainPicture.value, + [], self => { self.addTo(newfiberMap.map); self.hide(); @@ -339,7 +339,7 @@ stepNum.value++; if (stepNum.value <= 24) { stepLin.value = `${stepNum.value * 4.1666}%`; - newfiberMap.RainsLayer.next() + newfiberMap.RainsLayer.next(hgEndActive.value) timeLoop(); } else { emptyRun(); diff --git a/vite.config.js b/vite.config.js index 65ccb59..2190341 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,9 +5,9 @@ import autoprefixer from 'autoprefixer'; const Timestamp = new Date().getTime(); //随机时间戳 -let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; +// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; -// let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api'; +let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.124:9100'; // let ipLink = 'http://192.168.20.43:9100'; // 刘总 // let ipLink = 'http://192.168.16.43:9100';