diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 6acc50d..0aac354 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -155,7 +155,7 @@ }, { "id": "hn_kf_hm_pipeline", - "key": "pipeline_info_flow_ys", + "key": "pipeline_info_flow", "type": "LineLayer", "show": false, "params": { @@ -210,69 +210,7 @@ } ] } - ], - "columns": "类型" - }, - { - "id": "hubei_xiaogan_pipeline_info", - "key": "pipeline_info_flow_ws1", - "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": [ - "layer", - "''||function(v){\n let key = [\"YS\", \"WS\", \"HS\"];\n let colors = ['#184375', '#E6061A', '#E6061A'];\n return colors[key.indexOf(v)];\n }" - ] - }, - { - "name": "animate", - "params": [ - { - "interval": 1, - "duration": 1, - "trailLength": 2 - } - ] - }, - { - "name": "style", - "params": [ - { - "opacity": 0.6, - "lineTexture": true, - "iconStep": 10, - "borderWidth": 0.4, - "borderColor": "#fff" - } - ] - } - ], - "columns": "layer", - "filter": "layer in ('WS','HS')" + ] }, { "id": "", diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 6acc50d..0aac354 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -155,7 +155,7 @@ }, { "id": "hn_kf_hm_pipeline", - "key": "pipeline_info_flow_ys", + "key": "pipeline_info_flow", "type": "LineLayer", "show": false, "params": { @@ -210,69 +210,7 @@ } ] } - ], - "columns": "类型" - }, - { - "id": "hubei_xiaogan_pipeline_info", - "key": "pipeline_info_flow_ws1", - "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": [ - "layer", - "''||function(v){\n let key = [\"YS\", \"WS\", \"HS\"];\n let colors = ['#184375', '#E6061A', '#E6061A'];\n return colors[key.indexOf(v)];\n }" - ] - }, - { - "name": "animate", - "params": [ - { - "interval": 1, - "duration": 1, - "trailLength": 2 - } - ] - }, - { - "name": "style", - "params": [ - { - "opacity": 0.6, - "lineTexture": true, - "iconStep": 10, - "borderWidth": 0.4, - "borderColor": "#fff" - } - ] - } - ], - "columns": "layer", - "filter": "layer in ('WS','HS')" + ] }, { "id": "", diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 128d22e..bcaf8ea 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -170,19 +170,15 @@ show: false, }, { - layername: 'henan_kaifeng_ysline', + layername: 'ysLine1', //雨水管网 show: false, }, { - layername: 'henan_kaifeng_wsline', + layername: 'hsLine1', //合流管网 show: false, }, { - layername: 'henan_kaifeng_hsline', - show: false, - }, - { - layername: 'pipeLineFlow', + layername: 'pipeline_info_flow', //管网流向 show: false, }, ]); diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 6acc50d..0aac354 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -155,7 +155,7 @@ }, { "id": "hn_kf_hm_pipeline", - "key": "pipeline_info_flow_ys", + "key": "pipeline_info_flow", "type": "LineLayer", "show": false, "params": { @@ -210,69 +210,7 @@ } ] } - ], - "columns": "类型" - }, - { - "id": "hubei_xiaogan_pipeline_info", - "key": "pipeline_info_flow_ws1", - "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": [ - "layer", - "''||function(v){\n let key = [\"YS\", \"WS\", \"HS\"];\n let colors = ['#184375', '#E6061A', '#E6061A'];\n return colors[key.indexOf(v)];\n }" - ] - }, - { - "name": "animate", - "params": [ - { - "interval": 1, - "duration": 1, - "trailLength": 2 - } - ] - }, - { - "name": "style", - "params": [ - { - "opacity": 0.6, - "lineTexture": true, - "iconStep": 10, - "borderWidth": 0.4, - "borderColor": "#fff" - } - ] - } - ], - "columns": "layer", - "filter": "layer in ('WS','HS')" + ] }, { "id": "", diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 128d22e..bcaf8ea 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -170,19 +170,15 @@ show: false, }, { - layername: 'henan_kaifeng_ysline', + layername: 'ysLine1', //雨水管网 show: false, }, { - layername: 'henan_kaifeng_wsline', + layername: 'hsLine1', //合流管网 show: false, }, { - layername: 'henan_kaifeng_hsline', - show: false, - }, - { - layername: 'pipeLineFlow', + layername: 'pipeline_info_flow', //管网流向 show: false, }, ]); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 473dfd0..f3a1a6c 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -349,7 +349,7 @@ { isCheck: false, name: '管网流向', - layername: 'pipeline_info_flow_ys', + layername: 'pipeline_info_flow', url: 'pipeLineFlow_icon.png', type: 'dynamicLine', //data: pipeFlow, diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 6acc50d..0aac354 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -155,7 +155,7 @@ }, { "id": "hn_kf_hm_pipeline", - "key": "pipeline_info_flow_ys", + "key": "pipeline_info_flow", "type": "LineLayer", "show": false, "params": { @@ -210,69 +210,7 @@ } ] } - ], - "columns": "类型" - }, - { - "id": "hubei_xiaogan_pipeline_info", - "key": "pipeline_info_flow_ws1", - "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": [ - "layer", - "''||function(v){\n let key = [\"YS\", \"WS\", \"HS\"];\n let colors = ['#184375', '#E6061A', '#E6061A'];\n return colors[key.indexOf(v)];\n }" - ] - }, - { - "name": "animate", - "params": [ - { - "interval": 1, - "duration": 1, - "trailLength": 2 - } - ] - }, - { - "name": "style", - "params": [ - { - "opacity": 0.6, - "lineTexture": true, - "iconStep": 10, - "borderWidth": 0.4, - "borderColor": "#fff" - } - ] - } - ], - "columns": "layer", - "filter": "layer in ('WS','HS')" + ] }, { "id": "", diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 128d22e..bcaf8ea 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -170,19 +170,15 @@ show: false, }, { - layername: 'henan_kaifeng_ysline', + layername: 'ysLine1', //雨水管网 show: false, }, { - layername: 'henan_kaifeng_wsline', + layername: 'hsLine1', //合流管网 show: false, }, { - layername: 'henan_kaifeng_hsline', - show: false, - }, - { - layername: 'pipeLineFlow', + layername: 'pipeline_info_flow', //管网流向 show: false, }, ]); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 473dfd0..f3a1a6c 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -349,7 +349,7 @@ { isCheck: false, name: '管网流向', - layername: 'pipeline_info_flow_ys', + layername: 'pipeline_info_flow', url: 'pipeLineFlow_icon.png', type: 'dynamicLine', //data: pipeFlow, diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index ed69e6b..da6f0c2 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -118,19 +118,15 @@ show: false, }, { - layername: 'sewageFactory', //污水处理厂 + layername: 'ysLine1', //雨水管网 show: false, }, { - layername: 'henan_kaifeng_ysline', //雨水管网 + layername: 'hsLine1', //合流管网 show: false, }, { - layername: 'henan_kaifeng_hsline', //合流管网 - show: false, - }, - { - layername: 'pipeLineFlow', //管网流向 + layername: 'pipeline_info_flow', //管网流向 show: false, }, { @@ -142,7 +138,7 @@ show: false, }, ]); - }, 1000); + }, 5000); }); onBeforeUnmount(() => { bus.off('checkBZGYT');