diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index a46b332..b95a09f 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -262,6 +262,65 @@ "filter": "type in ('ws','hs')" }, { + "id": "sx_ya_smx_rq_line", + "key": "sx_ya_smx_rq_line_sz", + "type": "LineLayer", + "show": false, + "params": { + "autoFit": false, + "zIndex": 1 + }, + "methods": [ + { + "name": "size", + "params": [ + 3 + ] + }, + { + "name": "shape", + "params": [ + "line" + ] + }, + { + "name": "texture", + "params": [ + "02" + ] + }, + { + "name": "color", + "params": [ + "color", + "''||function(v){\n let key = [\"#FF0002\", \"rgba(234,26,26,1)\", \"rgba(249,227,28,1)\",\"rgba(25,201,25,1)\",\"rgba(29,53,234,1)\"];\n let colors = ['#FF0002', 'rgba(234,26,26,1)', 'rgba(249,227,28,1)','rgba(25,201,25,1)','rgba(29,53,234,1)'];\n return colors[key.indexOf(v)];\n }" + ] + }, + { + "name": "animate", + "params": [ + { + "interval": 1, + "duration": 2, + "trailLength": 2 + } + ] + }, + { + "name": "style", + "params": [ + { + "opacity": 0.6, + "lineTexture": true, + "iconStep": 100, + "borderWidth": 0.4, + "borderColor": "#fff" + } + ] + } + ] + }, + { "id": "", "key": "warning_monitor", "type": "PointLayer", @@ -514,7 +573,7 @@ "type": "line", "filter": [ "in", - "color", + "level", "" ], "paint": { @@ -817,7 +876,8 @@ ], "filter": [ [ - "rgba(249,227,28,1)" + "A\t", + "B\t" ] ] }, @@ -827,7 +887,7 @@ ], "filter": [ [ - "#FF0002" + "C\t" ] ] }, @@ -837,7 +897,7 @@ ], "filter": [ [ - "rgba(25,201,25,1)" + "D\t" ] ] }, @@ -847,7 +907,7 @@ ], "filter": [ [ - "rgba(29,53,234,1)" + "\"\"\t" ] ] }, @@ -857,11 +917,11 @@ ], "filter": [ [ - "#FF0002", - "rgba(234,26,26,1)", - "rgba(249,227,28,1)", - "rgba(25,201,25,1)", - "rgba(29,53,234,1)" + "A\t", + "B\t", + "C\t", + "D\t", + "\"\"\t" ] ] }, diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index a46b332..b95a09f 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -262,6 +262,65 @@ "filter": "type in ('ws','hs')" }, { + "id": "sx_ya_smx_rq_line", + "key": "sx_ya_smx_rq_line_sz", + "type": "LineLayer", + "show": false, + "params": { + "autoFit": false, + "zIndex": 1 + }, + "methods": [ + { + "name": "size", + "params": [ + 3 + ] + }, + { + "name": "shape", + "params": [ + "line" + ] + }, + { + "name": "texture", + "params": [ + "02" + ] + }, + { + "name": "color", + "params": [ + "color", + "''||function(v){\n let key = [\"#FF0002\", \"rgba(234,26,26,1)\", \"rgba(249,227,28,1)\",\"rgba(25,201,25,1)\",\"rgba(29,53,234,1)\"];\n let colors = ['#FF0002', 'rgba(234,26,26,1)', 'rgba(249,227,28,1)','rgba(25,201,25,1)','rgba(29,53,234,1)'];\n return colors[key.indexOf(v)];\n }" + ] + }, + { + "name": "animate", + "params": [ + { + "interval": 1, + "duration": 2, + "trailLength": 2 + } + ] + }, + { + "name": "style", + "params": [ + { + "opacity": 0.6, + "lineTexture": true, + "iconStep": 100, + "borderWidth": 0.4, + "borderColor": "#fff" + } + ] + } + ] + }, + { "id": "", "key": "warning_monitor", "type": "PointLayer", @@ -514,7 +573,7 @@ "type": "line", "filter": [ "in", - "color", + "level", "" ], "paint": { @@ -817,7 +876,8 @@ ], "filter": [ [ - "rgba(249,227,28,1)" + "A\t", + "B\t" ] ] }, @@ -827,7 +887,7 @@ ], "filter": [ [ - "#FF0002" + "C\t" ] ] }, @@ -837,7 +897,7 @@ ], "filter": [ [ - "rgba(25,201,25,1)" + "D\t" ] ] }, @@ -847,7 +907,7 @@ ], "filter": [ [ - "rgba(29,53,234,1)" + "\"\"\t" ] ] }, @@ -857,11 +917,11 @@ ], "filter": [ [ - "#FF0002", - "rgba(234,26,26,1)", - "rgba(249,227,28,1)", - "rgba(25,201,25,1)", - "rgba(29,53,234,1)" + "A\t", + "B\t", + "C\t", + "D\t", + "\"\"\t" ] ] }, diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cc8e024..6f21ee7 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -66,7 +66,7 @@ */ LayerData: [ { - title: "基本信息", + title: '基本信息', Show: true, children: [ { @@ -160,7 +160,7 @@ ], }, { - title: "燃气系统", + title: '燃气系统', Show: true, children: [ { @@ -170,6 +170,36 @@ layerVisible: false, }, { + layerName: '市政管网', + layerKey: 'rq_SZLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '庭院管网', + layerKey: 'rq_TYLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '立管', + layerKey: 'rq_LGLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '其他管网', + layerKey: 'rq_other', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '燃气管网流向', + layerKey: 'sx_ya_smx_rq_line_sz', + layerIcon: null, + layerVisible: false, + }, + { layerName: '调压器', layerKey: 'tiaoYaQi', layerIcon: null, @@ -202,7 +232,7 @@ ], }, { - title: "雨水系统", + title: '雨水系统', Show: true, children: [ { @@ -241,7 +271,7 @@ ], }, { - title: "污水系统", + title: '污水系统', Show: true, children: [ { @@ -278,7 +308,7 @@ ], }, { - title: "感知设备", + title: '感知设备', Show: true, children: [ { diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index a46b332..b95a09f 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -262,6 +262,65 @@ "filter": "type in ('ws','hs')" }, { + "id": "sx_ya_smx_rq_line", + "key": "sx_ya_smx_rq_line_sz", + "type": "LineLayer", + "show": false, + "params": { + "autoFit": false, + "zIndex": 1 + }, + "methods": [ + { + "name": "size", + "params": [ + 3 + ] + }, + { + "name": "shape", + "params": [ + "line" + ] + }, + { + "name": "texture", + "params": [ + "02" + ] + }, + { + "name": "color", + "params": [ + "color", + "''||function(v){\n let key = [\"#FF0002\", \"rgba(234,26,26,1)\", \"rgba(249,227,28,1)\",\"rgba(25,201,25,1)\",\"rgba(29,53,234,1)\"];\n let colors = ['#FF0002', 'rgba(234,26,26,1)', 'rgba(249,227,28,1)','rgba(25,201,25,1)','rgba(29,53,234,1)'];\n return colors[key.indexOf(v)];\n }" + ] + }, + { + "name": "animate", + "params": [ + { + "interval": 1, + "duration": 2, + "trailLength": 2 + } + ] + }, + { + "name": "style", + "params": [ + { + "opacity": 0.6, + "lineTexture": true, + "iconStep": 100, + "borderWidth": 0.4, + "borderColor": "#fff" + } + ] + } + ] + }, + { "id": "", "key": "warning_monitor", "type": "PointLayer", @@ -514,7 +573,7 @@ "type": "line", "filter": [ "in", - "color", + "level", "" ], "paint": { @@ -817,7 +876,8 @@ ], "filter": [ [ - "rgba(249,227,28,1)" + "A\t", + "B\t" ] ] }, @@ -827,7 +887,7 @@ ], "filter": [ [ - "#FF0002" + "C\t" ] ] }, @@ -837,7 +897,7 @@ ], "filter": [ [ - "rgba(25,201,25,1)" + "D\t" ] ] }, @@ -847,7 +907,7 @@ ], "filter": [ [ - "rgba(29,53,234,1)" + "\"\"\t" ] ] }, @@ -857,11 +917,11 @@ ], "filter": [ [ - "#FF0002", - "rgba(234,26,26,1)", - "rgba(249,227,28,1)", - "rgba(25,201,25,1)", - "rgba(29,53,234,1)" + "A\t", + "B\t", + "C\t", + "D\t", + "\"\"\t" ] ] }, diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cc8e024..6f21ee7 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -66,7 +66,7 @@ */ LayerData: [ { - title: "基本信息", + title: '基本信息', Show: true, children: [ { @@ -160,7 +160,7 @@ ], }, { - title: "燃气系统", + title: '燃气系统', Show: true, children: [ { @@ -170,6 +170,36 @@ layerVisible: false, }, { + layerName: '市政管网', + layerKey: 'rq_SZLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '庭院管网', + layerKey: 'rq_TYLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '立管', + layerKey: 'rq_LGLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '其他管网', + layerKey: 'rq_other', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '燃气管网流向', + layerKey: 'sx_ya_smx_rq_line_sz', + layerIcon: null, + layerVisible: false, + }, + { layerName: '调压器', layerKey: 'tiaoYaQi', layerIcon: null, @@ -202,7 +232,7 @@ ], }, { - title: "雨水系统", + title: '雨水系统', Show: true, children: [ { @@ -241,7 +271,7 @@ ], }, { - title: "污水系统", + title: '污水系统', Show: true, children: [ { @@ -278,7 +308,7 @@ ], }, { - title: "感知设备", + title: '感知设备', Show: true, children: [ { diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 493c201..4870556 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -802,7 +802,7 @@ console.log('popupData---', '告警---------', popupData); }); } - bus.emit('setLayerVisible', { layername: 'rq_all', isCheck: true }); //所有管网rq_all、市政rq_SZLH、庭院rq_TYLH、立管rq_LGLH、其他rq_other + bus.emit('setLayerVisible', { layername: 'rq_SZLH', isCheck: true }); //所有管网rq_all、市政rq_SZLH、庭院rq_TYLH、立管rq_LGLH、其他rq_other clearInterval(initeRQTimer); }, 100); diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index a46b332..b95a09f 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -262,6 +262,65 @@ "filter": "type in ('ws','hs')" }, { + "id": "sx_ya_smx_rq_line", + "key": "sx_ya_smx_rq_line_sz", + "type": "LineLayer", + "show": false, + "params": { + "autoFit": false, + "zIndex": 1 + }, + "methods": [ + { + "name": "size", + "params": [ + 3 + ] + }, + { + "name": "shape", + "params": [ + "line" + ] + }, + { + "name": "texture", + "params": [ + "02" + ] + }, + { + "name": "color", + "params": [ + "color", + "''||function(v){\n let key = [\"#FF0002\", \"rgba(234,26,26,1)\", \"rgba(249,227,28,1)\",\"rgba(25,201,25,1)\",\"rgba(29,53,234,1)\"];\n let colors = ['#FF0002', 'rgba(234,26,26,1)', 'rgba(249,227,28,1)','rgba(25,201,25,1)','rgba(29,53,234,1)'];\n return colors[key.indexOf(v)];\n }" + ] + }, + { + "name": "animate", + "params": [ + { + "interval": 1, + "duration": 2, + "trailLength": 2 + } + ] + }, + { + "name": "style", + "params": [ + { + "opacity": 0.6, + "lineTexture": true, + "iconStep": 100, + "borderWidth": 0.4, + "borderColor": "#fff" + } + ] + } + ] + }, + { "id": "", "key": "warning_monitor", "type": "PointLayer", @@ -514,7 +573,7 @@ "type": "line", "filter": [ "in", - "color", + "level", "" ], "paint": { @@ -817,7 +876,8 @@ ], "filter": [ [ - "rgba(249,227,28,1)" + "A\t", + "B\t" ] ] }, @@ -827,7 +887,7 @@ ], "filter": [ [ - "#FF0002" + "C\t" ] ] }, @@ -837,7 +897,7 @@ ], "filter": [ [ - "rgba(25,201,25,1)" + "D\t" ] ] }, @@ -847,7 +907,7 @@ ], "filter": [ [ - "rgba(29,53,234,1)" + "\"\"\t" ] ] }, @@ -857,11 +917,11 @@ ], "filter": [ [ - "#FF0002", - "rgba(234,26,26,1)", - "rgba(249,227,28,1)", - "rgba(25,201,25,1)", - "rgba(29,53,234,1)" + "A\t", + "B\t", + "C\t", + "D\t", + "\"\"\t" ] ] }, diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cc8e024..6f21ee7 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -66,7 +66,7 @@ */ LayerData: [ { - title: "基本信息", + title: '基本信息', Show: true, children: [ { @@ -160,7 +160,7 @@ ], }, { - title: "燃气系统", + title: '燃气系统', Show: true, children: [ { @@ -170,6 +170,36 @@ layerVisible: false, }, { + layerName: '市政管网', + layerKey: 'rq_SZLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '庭院管网', + layerKey: 'rq_TYLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '立管', + layerKey: 'rq_LGLH', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '其他管网', + layerKey: 'rq_other', + layerIcon: null, + layerVisible: false, + }, + { + layerName: '燃气管网流向', + layerKey: 'sx_ya_smx_rq_line_sz', + layerIcon: null, + layerVisible: false, + }, + { layerName: '调压器', layerKey: 'tiaoYaQi', layerIcon: null, @@ -202,7 +232,7 @@ ], }, { - title: "雨水系统", + title: '雨水系统', Show: true, children: [ { @@ -241,7 +271,7 @@ ], }, { - title: "污水系统", + title: '污水系统', Show: true, children: [ { @@ -278,7 +308,7 @@ ], }, { - title: "感知设备", + title: '感知设备', Show: true, children: [ { diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 493c201..4870556 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -802,7 +802,7 @@ console.log('popupData---', '告警---------', popupData); }); } - bus.emit('setLayerVisible', { layername: 'rq_all', isCheck: true }); //所有管网rq_all、市政rq_SZLH、庭院rq_TYLH、立管rq_LGLH、其他rq_other + bus.emit('setLayerVisible', { layername: 'rq_SZLH', isCheck: true }); //所有管网rq_all、市政rq_SZLH、庭院rq_TYLH、立管rq_LGLH、其他rq_other clearInterval(initeRQTimer); }, 100); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 4e5236d..dc21b9e 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -5,19 +5,13 @@
- + 延安
@@ -36,9 +30,7 @@ - + @@ -65,42 +57,17 @@ /> - + - + - + - - + - + - + - +
@@ -128,11 +91,7 @@