diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index dc0e2dc..72ec571 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -579,18 +579,9 @@ "type": "symbol", "filter": [ "in", - "devicetype", - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 + "devicetype" ], "layout": { - "visibility": "none", "icon-image": [ "match", [ @@ -617,7 +608,7 @@ ], "icon-size": 0.65 }, - "minzoom": 15.5, + "minzoom": 10, "maxzoom": 24, "mType": "mvt", "columns": "id,deviceType,deviceName,st_asText(geometrys) as geometry" @@ -861,6 +852,56 @@ "rgba(29,53,234,1)" ] ] + }, + "tiaoYaQi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 3 + ] + ] + }, + "rq_jieDian": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 4 + ] + ] + }, + "jiXingBaoHu": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 5 + ] + ] + }, + "rq_liuLiangJi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 7 + ] + ] + }, + "rq_unknow": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 1 + ] + ] } } } \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index dc0e2dc..72ec571 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -579,18 +579,9 @@ "type": "symbol", "filter": [ "in", - "devicetype", - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 + "devicetype" ], "layout": { - "visibility": "none", "icon-image": [ "match", [ @@ -617,7 +608,7 @@ ], "icon-size": 0.65 }, - "minzoom": 15.5, + "minzoom": 10, "maxzoom": 24, "mType": "mvt", "columns": "id,deviceType,deviceName,st_asText(geometrys) as geometry" @@ -861,6 +852,56 @@ "rgba(29,53,234,1)" ] ] + }, + "tiaoYaQi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 3 + ] + ] + }, + "rq_jieDian": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 4 + ] + ] + }, + "jiXingBaoHu": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 5 + ] + ] + }, + "rq_liuLiangJi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 7 + ] + ] + }, + "rq_unknow": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 1 + ] + ] } } } \ No newline at end of file diff --git a/src/assets/yanAnVideo.json b/src/assets/yanAnVideo.json new file mode 100644 index 0000000..05d666a --- /dev/null +++ b/src/assets/yanAnVideo.json @@ -0,0 +1 @@ +{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[109.50929458161247,36.608860065638659]},"properties":{"FID":0,"Id":0,"name":"永安路","type":"video","lon":109.509294582,"lat":36.608860065599998}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[109.51928058458876,36.616847321370052]},"properties":{"FID":1,"Id":0,"name":"永昌路北口","type":"video","lon":109.519280585,"lat":36.616847321400002}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[109.51934245057492,36.619781196790321]},"properties":{"FID":2,"Id":0,"name":"桥儿沟隧道","type":"video","lon":109.519342451,"lat":36.619781196799998}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[109.53328371260838,36.630843786898886]},"properties":{"FID":3,"Id":0,"name":"刘万家沟沟口","type":"video","lon":109.533283713,"lat":36.630843786900002}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[109.5368529041172,36.631533830590591]},"properties":{"FID":4,"Id":0,"name":"原水果市场","type":"video","lon":109.536852904,"lat":36.631533830599999}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[109.47499607889007,36.608187907562133]},"properties":{"FID":5,"Id":0,"name":"王家坪旧址门口","type":"video","lon":109.47499607899999,"lat":36.608187907599998}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[109.46877497809032,36.607208759358237]},"properties":{"FID":6,"Id":0,"name":"大砭沟与北大街交叉口","type":"video","lon":109.468774978,"lat":36.607208759400002}},{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[109.51050513239916,36.614373871654422]},"properties":{"FID":0,"Id":0,"name":"长青路纺织花园车库","type":"video","lon":109.51050513200001,"lat":36.614373871700003}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[109.52901020064175,36.623497914881455]},"properties":{"FID":1,"Id":0,"name":"百米大道延安小学十字","type":"video","lon":109.52901020100001,"lat":36.6234979149}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[109.52174808565189,36.62196839734694]},"properties":{"FID":2,"Id":0,"name":"长青路石油小区","type":"video","lon":109.521748086,"lat":36.621968397300002}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[109.54393239547498,36.636596133880616]},"properties":{"FID":3,"Id":0,"name":"凯泽世纪花园","type":"video","lon":109.543932395,"lat":36.636596133899999}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[109.45545475537958,36.631279386893233]},"properties":{"FID":4,"Id":0,"name":"杨家湾超市门前","type":"video","lon":109.45545475500001,"lat":36.631279386899998}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[109.44623434398206,36.568042831202277]},"properties":{"FID":5,"Id":0,"name":"马家湾博城至培植中学","type":"video","lon":109.446234344,"lat":36.568042831200003}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[109.44819739931187,36.565580089061243]},"properties":{"FID":6,"Id":0,"name":"柳林隧道博城向柳\r\n柳林隧道博城向柳林方向引桥入口","type":"video","lon":109.44819739899999,"lat":36.565580089100003}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[109.48206545753828,36.575682883915171]},"properties":{"FID":7,"Id":0,"name":"七里铺街","type":"video","lon":109.48206545799999,"lat":36.575682883900001}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[109.48551091707472,36.58735402117572]},"properties":{"FID":8,"Id":0,"name":"南关街大礼堂","type":"video","lon":109.485510917,"lat":36.587354021199999}}]} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index dc0e2dc..72ec571 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -579,18 +579,9 @@ "type": "symbol", "filter": [ "in", - "devicetype", - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8 + "devicetype" ], "layout": { - "visibility": "none", "icon-image": [ "match", [ @@ -617,7 +608,7 @@ ], "icon-size": 0.65 }, - "minzoom": 15.5, + "minzoom": 10, "maxzoom": 24, "mType": "mvt", "columns": "id,deviceType,deviceName,st_asText(geometrys) as geometry" @@ -861,6 +852,56 @@ "rgba(29,53,234,1)" ] ] + }, + "tiaoYaQi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 3 + ] + ] + }, + "rq_jieDian": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 4 + ] + ] + }, + "jiXingBaoHu": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 5 + ] + ] + }, + "rq_liuLiangJi": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 7 + ] + ] + }, + "rq_unknow": { + "layerName": [ + "sx_ya_smx_rq_point" + ], + "filter": [ + [ + 1 + ] + ] } } } \ No newline at end of file diff --git a/src/assets/yanAnVideo.json b/src/assets/yanAnVideo.json new file mode 100644 index 0000000..05d666a --- /dev/null +++ b/src/assets/yanAnVideo.json @@ -0,0 +1 @@ +{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[109.50929458161247,36.608860065638659]},"properties":{"FID":0,"Id":0,"name":"永安路","type":"video","lon":109.509294582,"lat":36.608860065599998}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[109.51928058458876,36.616847321370052]},"properties":{"FID":1,"Id":0,"name":"永昌路北口","type":"video","lon":109.519280585,"lat":36.616847321400002}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[109.51934245057492,36.619781196790321]},"properties":{"FID":2,"Id":0,"name":"桥儿沟隧道","type":"video","lon":109.519342451,"lat":36.619781196799998}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[109.53328371260838,36.630843786898886]},"properties":{"FID":3,"Id":0,"name":"刘万家沟沟口","type":"video","lon":109.533283713,"lat":36.630843786900002}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[109.5368529041172,36.631533830590591]},"properties":{"FID":4,"Id":0,"name":"原水果市场","type":"video","lon":109.536852904,"lat":36.631533830599999}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[109.47499607889007,36.608187907562133]},"properties":{"FID":5,"Id":0,"name":"王家坪旧址门口","type":"video","lon":109.47499607899999,"lat":36.608187907599998}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[109.46877497809032,36.607208759358237]},"properties":{"FID":6,"Id":0,"name":"大砭沟与北大街交叉口","type":"video","lon":109.468774978,"lat":36.607208759400002}},{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[109.51050513239916,36.614373871654422]},"properties":{"FID":0,"Id":0,"name":"长青路纺织花园车库","type":"video","lon":109.51050513200001,"lat":36.614373871700003}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[109.52901020064175,36.623497914881455]},"properties":{"FID":1,"Id":0,"name":"百米大道延安小学十字","type":"video","lon":109.52901020100001,"lat":36.6234979149}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[109.52174808565189,36.62196839734694]},"properties":{"FID":2,"Id":0,"name":"长青路石油小区","type":"video","lon":109.521748086,"lat":36.621968397300002}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[109.54393239547498,36.636596133880616]},"properties":{"FID":3,"Id":0,"name":"凯泽世纪花园","type":"video","lon":109.543932395,"lat":36.636596133899999}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[109.45545475537958,36.631279386893233]},"properties":{"FID":4,"Id":0,"name":"杨家湾超市门前","type":"video","lon":109.45545475500001,"lat":36.631279386899998}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[109.44623434398206,36.568042831202277]},"properties":{"FID":5,"Id":0,"name":"马家湾博城至培植中学","type":"video","lon":109.446234344,"lat":36.568042831200003}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[109.44819739931187,36.565580089061243]},"properties":{"FID":6,"Id":0,"name":"柳林隧道博城向柳\r\n柳林隧道博城向柳林方向引桥入口","type":"video","lon":109.44819739899999,"lat":36.565580089100003}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[109.48206545753828,36.575682883915171]},"properties":{"FID":7,"Id":0,"name":"七里铺街","type":"video","lon":109.48206545799999,"lat":36.575682883900001}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[109.48551091707472,36.58735402117572]},"properties":{"FID":8,"Id":0,"name":"南关街大礼堂","type":"video","lon":109.485510917,"lat":36.587354021199999}}]} \ No newline at end of file diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 0e60e2e..18bca77 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -39,6 +39,7 @@ import yanAnFengXian from '@/assets/yanAnFengXian.json'; import yanAnPipeSupervise from '@/assets/yanAnPipeSupervise.json'; import yanAnPKSupervise from '@/assets/yanAnPKSupervise.json'; +import yanAnVideo from '@/assets/yanAnVideo.json'; import bus from '@/bus'; import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js'; const AllData = reactive({ @@ -85,6 +86,47 @@ ], }, { + title: '燃气系统', + children: [ + { + layerName: '燃气管网', + layerKey: 'rq_all', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '调压器', + layerKey: 'tiaoYaQi', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '节点', + layerKey: 'rq_jieDian', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '极性保护', + layerKey: 'jiXingBaoHu', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '流量计', + layerKey: 'rq_liuLiangJi', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '未知设备', + layerKey: 'rq_unknow', + layerIcon: null, + layerVisible: false, + }, + ], + }, + { title: '雨水系统', children: [ { @@ -182,6 +224,13 @@ layerVisible: false, data: yanAnPKSupervise, }, + { + layerName: '视频监测', + layerKey: 'video', + layerIcon: null, + layerVisible: false, + data: yanAnVideo, + }, ], }, ], @@ -294,6 +343,16 @@ } } }; +onMounted(() => { + bus.on('clearAllLayer', () => { + AllData.LayerData.forEach(data => { + data.children.map(item => { + item.layerVisible = true; + layerClick(item); + }); + }); + }); +});