diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ef310c5..1660e35 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1347,13 +1347,22 @@ "paint": { "line-color": [ "match", - ["get", "管段类型"], - "YS", "#37BE5F", - "WS", "#E6061A", - "HS", "#ccff12", + ["concat", ["get", "管段类型"], ["get", "管线状态"]], + "YS0", "rgba(57, 255, 220, 1)", + "WS0", "rgba(255, 52, 72, 1)", + "HS0", "#ccff12", + "YS1", "rgba(197, 255, 57, 1)", + "WS1", "rgba(222, 0, 242, 1)", + "HS1", "#ccff12", "#000000" ], - "line-width": 2 + "line-dasharray": [ + "match", + ["get", "管线状态"], + 1, [2, 2], + [1] + ], + "line-width": 4 }, "layout": {}, "minzoom": 7, @@ -1406,7 +1415,7 @@ "text-line-height": 3, "text-anchor": "top" }, - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water_name as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" @@ -1415,7 +1424,7 @@ "id": "pipeline_info_text", "key": "pip_pipeline_info", "type": "symbol", - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "filter": [ "all", diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ef310c5..1660e35 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1347,13 +1347,22 @@ "paint": { "line-color": [ "match", - ["get", "管段类型"], - "YS", "#37BE5F", - "WS", "#E6061A", - "HS", "#ccff12", + ["concat", ["get", "管段类型"], ["get", "管线状态"]], + "YS0", "rgba(57, 255, 220, 1)", + "WS0", "rgba(255, 52, 72, 1)", + "HS0", "#ccff12", + "YS1", "rgba(197, 255, 57, 1)", + "WS1", "rgba(222, 0, 242, 1)", + "HS1", "#ccff12", "#000000" ], - "line-width": 2 + "line-dasharray": [ + "match", + ["get", "管线状态"], + 1, [2, 2], + [1] + ], + "line-width": 4 }, "layout": {}, "minzoom": 7, @@ -1406,7 +1415,7 @@ "text-line-height": 3, "text-anchor": "top" }, - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water_name as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" @@ -1415,7 +1424,7 @@ "id": "pipeline_info_text", "key": "pip_pipeline_info", "type": "symbol", - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "filter": [ "all", diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js index 2079b53..1aa3b7a 100644 --- a/src/utils/fixDict.js +++ b/src/utils/fixDict.js @@ -209,6 +209,20 @@ value: '4', }, ], + + //是否字段 + isState: [ + { + label: '是', + value: '1', + elTagType: 'primary', + }, + { + label: '否', + value: '0', + elTagType: 'info', + }, + ], // factorEchartsColor:[//对应的监测因子echarts颜色 // { diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ef310c5..1660e35 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1347,13 +1347,22 @@ "paint": { "line-color": [ "match", - ["get", "管段类型"], - "YS", "#37BE5F", - "WS", "#E6061A", - "HS", "#ccff12", + ["concat", ["get", "管段类型"], ["get", "管线状态"]], + "YS0", "rgba(57, 255, 220, 1)", + "WS0", "rgba(255, 52, 72, 1)", + "HS0", "#ccff12", + "YS1", "rgba(197, 255, 57, 1)", + "WS1", "rgba(222, 0, 242, 1)", + "HS1", "#ccff12", "#000000" ], - "line-width": 2 + "line-dasharray": [ + "match", + ["get", "管线状态"], + 1, [2, 2], + [1] + ], + "line-width": 4 }, "layout": {}, "minzoom": 7, @@ -1406,7 +1415,7 @@ "text-line-height": 3, "text-anchor": "top" }, - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water_name as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" @@ -1415,7 +1424,7 @@ "id": "pipeline_info_text", "key": "pip_pipeline_info", "type": "symbol", - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "filter": [ "all", diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js index 2079b53..1aa3b7a 100644 --- a/src/utils/fixDict.js +++ b/src/utils/fixDict.js @@ -209,6 +209,20 @@ value: '4', }, ], + + //是否字段 + isState: [ + { + label: '是', + value: '1', + elTagType: 'primary', + }, + { + label: '否', + value: '0', + elTagType: 'info', + }, + ], // factorEchartsColor:[//对应的监测因子echarts颜色 // { diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index b263c92..0724fd5 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -300,6 +300,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightGeometry: "", RightShowType: "", RightStCode: "", TitleName: [ @@ -677,12 +678,14 @@ AllData.RightShow = false; AllData.RightShowID = ""; AllData.RightStCode = ""; + AllData.RightGeometry = ""; } else { AllData.RightStCode = Row.properties.stCode; // 管点 if (Row.properties.pointType == "sewage_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShowType = "sewage_pipeline_quality"; AllData.RightShow = true; // Row.properties.wellCode @@ -737,11 +740,13 @@ AllData.ClicksiteName = ""; AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightGeometry = ""; AllData.RightShowType = ""; } else { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; AllData.RightShowType = "sewage_pump_station_info"; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShow = true; } } @@ -1134,6 +1139,7 @@ stCode: AllData.RightStCode, wellCode: "", id: AllData.RightShowID, + geometry: AllData.RightGeometry, dataId: "", RefName: "jiancefenxiGWFX", }; diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ef310c5..1660e35 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1347,13 +1347,22 @@ "paint": { "line-color": [ "match", - ["get", "管段类型"], - "YS", "#37BE5F", - "WS", "#E6061A", - "HS", "#ccff12", + ["concat", ["get", "管段类型"], ["get", "管线状态"]], + "YS0", "rgba(57, 255, 220, 1)", + "WS0", "rgba(255, 52, 72, 1)", + "HS0", "#ccff12", + "YS1", "rgba(197, 255, 57, 1)", + "WS1", "rgba(222, 0, 242, 1)", + "HS1", "#ccff12", "#000000" ], - "line-width": 2 + "line-dasharray": [ + "match", + ["get", "管线状态"], + 1, [2, 2], + [1] + ], + "line-width": 4 }, "layout": {}, "minzoom": 7, @@ -1406,7 +1415,7 @@ "text-line-height": 3, "text-anchor": "top" }, - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water_name as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" @@ -1415,7 +1424,7 @@ "id": "pipeline_info_text", "key": "pip_pipeline_info", "type": "symbol", - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "filter": [ "all", diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js index 2079b53..1aa3b7a 100644 --- a/src/utils/fixDict.js +++ b/src/utils/fixDict.js @@ -209,6 +209,20 @@ value: '4', }, ], + + //是否字段 + isState: [ + { + label: '是', + value: '1', + elTagType: 'primary', + }, + { + label: '否', + value: '0', + elTagType: 'info', + }, + ], // factorEchartsColor:[//对应的监测因子echarts颜色 // { diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index b263c92..0724fd5 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -300,6 +300,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightGeometry: "", RightShowType: "", RightStCode: "", TitleName: [ @@ -677,12 +678,14 @@ AllData.RightShow = false; AllData.RightShowID = ""; AllData.RightStCode = ""; + AllData.RightGeometry = ""; } else { AllData.RightStCode = Row.properties.stCode; // 管点 if (Row.properties.pointType == "sewage_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShowType = "sewage_pipeline_quality"; AllData.RightShow = true; // Row.properties.wellCode @@ -737,11 +740,13 @@ AllData.ClicksiteName = ""; AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightGeometry = ""; AllData.RightShowType = ""; } else { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; AllData.RightShowType = "sewage_pump_station_info"; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShow = true; } } @@ -1134,6 +1139,7 @@ stCode: AllData.RightStCode, wellCode: "", id: AllData.RightShowID, + geometry: AllData.RightGeometry, dataId: "", RefName: "jiancefenxiGWFX", }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 7061aec..ab2e36e 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -346,6 +346,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightGeometry: "", RightShowType: "", RightStCode: "", TitleName: [ @@ -725,12 +726,14 @@ AllData.RightShowID = ""; AllData.RightShowType = ""; AllData.RightStCode = ""; + AllData.RightGeometry = ""; } else { AllData.RightStCode = Row.properties.stCode; // 管点 if (Row.properties.pointType == "rainwater_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShowType = "rainwater_pipeline_quality"; AllData.RightShow = true; // Row.properties.wellCode @@ -791,11 +794,13 @@ AllData.ClicksiteName = ""; AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightGeometry = ""; AllData.RightShowType = ""; } else { AllData.RightShowType = "rain_water_pump_station_info"; AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShow = true; } } @@ -1257,6 +1262,7 @@ stCode: AllData.RightStCode, wellCode: "", id: AllData.RightShowID, + geometry: AllData.RightGeometry, dataId: "", RefName: "jiancefenxiGWFX", }; diff --git a/public/static/libs/mapbox/json/ws_flow.json b/public/static/libs/mapbox/json/ws_flow.json index 608c599..bac92fb 100644 --- a/public/static/libs/mapbox/json/ws_flow.json +++ b/public/static/libs/mapbox/json/ws_flow.json @@ -2,7 +2,7 @@ "type": "FeatureCollection", "name": "l1_L", "features": [ -{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.37262647198898, 30.468084154344041 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, +{ "type": "Feature", "properties": { "bind": "汤逊湖污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372626620940153, 30.468084154322774 ], [ 114.372730035840988, 30.467890354491729 ], [ 114.373055391832708, 30.467788823144584 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.38103613443667, 30.495581226536807 ], [ 114.381228040646178, 30.495542066049278 ], [ 114.381251023304486, 30.49561202583169 ], [ 114.381265013073886, 30.49565100240898 ], [ 114.381297994738262, 30.495676966415463 ], [ 114.381362963392505, 30.495674911126113 ], [ 114.381425936148432, 30.495665864884383 ], [ 114.381756783597964, 30.495613598468651 ], [ 114.382044655929306, 30.495552374541198 ], [ 114.382118625105207, 30.495520322250758 ], [ 114.382331532152293, 30.495491154512063 ], [ 114.382719367625796, 30.49543885306425 ], [ 114.382761350313856, 30.495431821169529 ], [ 114.383057100193881, 30.496875162860569 ], [ 114.383118040106467, 30.497265997970896 ] ] } }, { "type": "Feature", "properties": { "bind": "绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373055422212914, 30.467788762384171 ], [ 114.37301379704131, 30.46798500221032 ], [ 114.372738506916775, 30.468163775499491 ], [ 114.372434232973589, 30.468463553075868 ], [ 114.373667210694364, 30.46874905666705 ], [ 114.373589251600208, 30.468982083019185 ], [ 114.3735482665777, 30.469218072281905 ], [ 114.374497517178611, 30.469420958902084 ], [ 114.375751574922816, 30.469730523025742 ], [ 114.375363813179504, 30.470171818722459 ], [ 114.375042974009688, 30.471002942912133 ], [ 114.375163876357817, 30.471109783807847 ], [ 114.374958978133179, 30.471663857457404 ], [ 114.374867010361797, 30.472072847966132 ], [ 114.374734068849108, 30.472533869379607 ], [ 114.374562131119504, 30.473294853343734 ], [ 114.374364282317941, 30.473273077166436 ], [ 114.374216394154473, 30.473281238746523 ], [ 114.374082494998518, 30.473301382237516 ], [ 114.373903624535302, 30.47339955567281 ], [ 114.373532899327245, 30.473535931089952 ], [ 114.37316317739544, 30.473719302468059 ], [ 114.372746495264934, 30.473942721791282 ], [ 114.372430743959981, 30.474070054571897 ], [ 114.372379273429857, 30.473977079216709 ] ] } }, { "type": "Feature", "properties": { "bind": "龙王咀污水系统,龙王咀片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.373838311850193, 30.500478972104318 ], [ 114.37412410395541, 30.500331696384681 ], [ 114.374575781253313, 30.500102265115331 ], [ 114.375706012279849, 30.499469233032634 ], [ 114.376091761416689, 30.499246892435927 ], [ 114.375926904807045, 30.498919161970377 ], [ 114.375324435611489, 30.497744147282237 ], [ 114.374631059525342, 30.496436281742763 ], [ 114.374618071773796, 30.496407304437909 ], [ 114.374450209303802, 30.496277526793975 ], [ 114.374345290978084, 30.496251650121124 ], [ 114.374210394023052, 30.49624780063758 ], [ 114.374846348741514, 30.494629276715557 ] ] } }, @@ -150,6 +150,7 @@ { "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "左岭污水系统" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.60088763820653, 30.482038041811709 ], [ 114.600585622231932, 30.495424972226093 ], [ 114.598900088796455, 30.497301647043592 ] ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南泥湾污水泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.383774272571642, 30.445596135540651 ] } }, { "type": "Feature", "properties": { "id": "11", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "南湖社区排污口截污泵站", "bind": "汤逊湖污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.37262662086647, 30.468084154344044 ] } }, -{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } } +{ "type": "Feature", "properties": { "id": "24", "pointType": "sewage_pump_station_info", "_type": "1_泵站", "name": "石门峰1#泵站", "bind": "花山污水系统" }, "geometry": { "type": "Point", "coordinates": [ 114.479054344609409, 30.536797500015865 ] } }, +{ "type": "Feature", "properties": { "id": null, "pointType": null, "_type": null, "name": null, "bind": "龙王咀污水系统,汤逊湖污水系统,绣球山片" }, "geometry": { "type": "LineString", "coordinates": [ [ 114.372379272642689, 30.473977079301104 ], [ 114.371880454897337, 30.473449926080864 ], [ 114.372164835942087, 30.468496572016008 ], [ 114.372626621177488, 30.468084154322778 ] ] } } ] } diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ef310c5..1660e35 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1347,13 +1347,22 @@ "paint": { "line-color": [ "match", - ["get", "管段类型"], - "YS", "#37BE5F", - "WS", "#E6061A", - "HS", "#ccff12", + ["concat", ["get", "管段类型"], ["get", "管线状态"]], + "YS0", "rgba(57, 255, 220, 1)", + "WS0", "rgba(255, 52, 72, 1)", + "HS0", "#ccff12", + "YS1", "rgba(197, 255, 57, 1)", + "WS1", "rgba(222, 0, 242, 1)", + "HS1", "#ccff12", "#000000" ], - "line-width": 2 + "line-dasharray": [ + "match", + ["get", "管线状态"], + 1, [2, 2], + [1] + ], + "line-width": 4 }, "layout": {}, "minzoom": 7, @@ -1406,7 +1415,7 @@ "text-line-height": 3, "text-anchor": "top" }, - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water_name as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" @@ -1415,7 +1424,7 @@ "id": "pipeline_info_text", "key": "pip_pipeline_info", "type": "symbol", - "minzoom": 15, + "minzoom": 17, "maxzoom": 24, "filter": [ "all", diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js index 2079b53..1aa3b7a 100644 --- a/src/utils/fixDict.js +++ b/src/utils/fixDict.js @@ -209,6 +209,20 @@ value: '4', }, ], + + //是否字段 + isState: [ + { + label: '是', + value: '1', + elTagType: 'primary', + }, + { + label: '否', + value: '0', + elTagType: 'info', + }, + ], // factorEchartsColor:[//对应的监测因子echarts颜色 // { diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index b263c92..0724fd5 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -300,6 +300,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightGeometry: "", RightShowType: "", RightStCode: "", TitleName: [ @@ -677,12 +678,14 @@ AllData.RightShow = false; AllData.RightShowID = ""; AllData.RightStCode = ""; + AllData.RightGeometry = ""; } else { AllData.RightStCode = Row.properties.stCode; // 管点 if (Row.properties.pointType == "sewage_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShowType = "sewage_pipeline_quality"; AllData.RightShow = true; // Row.properties.wellCode @@ -737,11 +740,13 @@ AllData.ClicksiteName = ""; AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightGeometry = ""; AllData.RightShowType = ""; } else { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; AllData.RightShowType = "sewage_pump_station_info"; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShow = true; } } @@ -1134,6 +1139,7 @@ stCode: AllData.RightStCode, wellCode: "", id: AllData.RightShowID, + geometry: AllData.RightGeometry, dataId: "", RefName: "jiancefenxiGWFX", }; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 7061aec..ab2e36e 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -346,6 +346,7 @@ waterRegionCode: "", //分区编号 RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 RightShowID: "", + RightGeometry: "", RightShowType: "", RightStCode: "", TitleName: [ @@ -725,12 +726,14 @@ AllData.RightShowID = ""; AllData.RightShowType = ""; AllData.RightStCode = ""; + AllData.RightGeometry = ""; } else { AllData.RightStCode = Row.properties.stCode; // 管点 if (Row.properties.pointType == "rainwater_pipeline_quality") { AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShowType = "rainwater_pipeline_quality"; AllData.RightShow = true; // Row.properties.wellCode @@ -791,11 +794,13 @@ AllData.ClicksiteName = ""; AllData.RightShow = false; AllData.RightShowID = ""; + AllData.RightGeometry = ""; AllData.RightShowType = ""; } else { AllData.RightShowType = "rain_water_pump_station_info"; AllData.ClicksiteName = Row.properties.name; AllData.RightShowID = Row.properties.id; + AllData.RightGeometry = Row.properties.geometry; AllData.RightShow = true; } } @@ -1257,6 +1262,7 @@ stCode: AllData.RightStCode, wellCode: "", id: AllData.RightShowID, + geometry: AllData.RightGeometry, dataId: "", RefName: "jiancefenxiGWFX", }; diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue index bfd8be4..d2f031c 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue @@ -1092,109 +1092,85 @@