diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/src/views/gisMapPage/LegendDataMain.js b/src/views/gisMapPage/LegendDataMain.js
index f3e3f98..795048a 100644
--- a/src/views/gisMapPage/LegendDataMain.js
+++ b/src/views/gisMapPage/LegendDataMain.js
@@ -165,7 +165,7 @@
// isCheck: false,
// name: '排口监测',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/src/views/gisMapPage/LegendDataMain.js b/src/views/gisMapPage/LegendDataMain.js
index f3e3f98..795048a 100644
--- a/src/views/gisMapPage/LegendDataMain.js
+++ b/src/views/gisMapPage/LegendDataMain.js
@@ -165,7 +165,7 @@
// isCheck: false,
// name: '排口监测',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/gisMapPage/commonLegend.js b/src/views/gisMapPage/commonLegend.js
index 3adda70..0b40687 100644
--- a/src/views/gisMapPage/commonLegend.js
+++ b/src/views/gisMapPage/commonLegend.js
@@ -322,7 +322,7 @@
// isCheck: false,
// name: '排口',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/src/views/gisMapPage/LegendDataMain.js b/src/views/gisMapPage/LegendDataMain.js
index f3e3f98..795048a 100644
--- a/src/views/gisMapPage/LegendDataMain.js
+++ b/src/views/gisMapPage/LegendDataMain.js
@@ -165,7 +165,7 @@
// isCheck: false,
// name: '排口监测',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/gisMapPage/commonLegend.js b/src/views/gisMapPage/commonLegend.js
index 3adda70..0b40687 100644
--- a/src/views/gisMapPage/commonLegend.js
+++ b/src/views/gisMapPage/commonLegend.js
@@ -322,7 +322,7 @@
// isCheck: false,
// name: '排口',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..0dcce8e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -120,7 +120,7 @@
{ name: '排水防涝', id: 4 },
{ name: '长效运维', id: 5 },
]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
const showPanel = ref(false);
const showLegend = ref(false);
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/src/views/gisMapPage/LegendDataMain.js b/src/views/gisMapPage/LegendDataMain.js
index f3e3f98..795048a 100644
--- a/src/views/gisMapPage/LegendDataMain.js
+++ b/src/views/gisMapPage/LegendDataMain.js
@@ -165,7 +165,7 @@
// isCheck: false,
// name: '排口监测',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/gisMapPage/commonLegend.js b/src/views/gisMapPage/commonLegend.js
index 3adda70..0b40687 100644
--- a/src/views/gisMapPage/commonLegend.js
+++ b/src/views/gisMapPage/commonLegend.js
@@ -322,7 +322,7 @@
// isCheck: false,
// name: '排口',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..0dcce8e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -120,7 +120,7 @@
{ name: '排水防涝', id: 4 },
{ name: '长效运维', id: 5 },
]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
const showPanel = ref(false);
const showLegend = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 218bc07..473dfd0 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -17,6 +17,7 @@
WSCLC,
waterLogingPoint,
projectStation,
+ pipeMonitorData,
ysArea,
wsArea,
hsArea,
@@ -72,6 +73,16 @@
if (projectStationRes && projectStationRes.code == 200) {
projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
}
+ // 管网监测点 测试用
+ pipeMonitorData = this.getGeojsonData([
+ {
+ projectNo: 'JZGW02',
+ projectName: '汴京路管网监测点',
+ stCode: '2109600028',
+ stName: '汴京路管网监测点',
+ lonlat: '114.3141225,34.79221',
+ },
+ ]);
//发送图例
legendDataList = this.legendData();
bus.emit('cesiumLegendDataList', legendDataList);
@@ -438,6 +449,15 @@
type: 'point',
data: projectStation,
},
+ {
+ isCheck: false,
+ name: '管网监测',
+ layername: 'pipeMonitor',
+ url: 'combineLine_icon.png', //图层+json √
+ mapUrl: 'YQGXMXs.png',
+ type: 'point',
+ data: pipeMonitorData,
+ },
],
],
},
diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 59c72a5..ac6803f 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
"params": {
"basemap": "https://supermap2.wh-nf.cn:8090/bm",
"mvt": "https://supermap0.wh-nf.cn:8090/vt",
- "sprites": [
- "/static/libs/mapbox/style/sprite/sprite5"
- ],
+ "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
"init": {
- "center": [
- 114.312,
- 34.802
- ],
+ "center": [114.312, 34.802],
"zoom": 12.9,
"pitch": 55,
"style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
"params": {
"id": "newfiber-XYZLayer",
"url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ],
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
"minZoom": 1,
"maxZoom": 19,
"tileType": ""
@@ -51,9 +37,7 @@
"methods": [
{
"name": "addTo",
- "params": [
- "''||map"
- ]
+ "params": ["''||map"]
},
{
"name": "hide",
@@ -67,16 +51,7 @@
"params": {
"id": "newfiber-WMTSLayer",
"url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
- "subdomains": [
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7"
- ]
+ "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
},
"methods": []
},
@@ -85,12 +60,7 @@
"type": "CanvasLayer",
"params": {
"id": "newfiber-CanvasLayer",
- "bbox": [
- 110.98300209463804,
- 32.415967161418266,
- 111.34992583909221,
- 32.599933881244255
- ],
+ "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
"width": 3000,
"height": 1172,
"images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "color",
@@ -165,21 +133,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -225,21 +187,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -286,28 +242,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(236,223,25,1.0)"
- ]
+ "params": ["rgba(236,223,25,1.0)"]
},
{
"name": "size",
- "params": [
- "size",
- "''||function(v){return v}"
- ]
+ "params": ["size", "''||function(v){return v}"]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -331,21 +278,15 @@
"methods": [
{
"name": "size",
- "params": [
- 3
- ]
+ "params": [3]
},
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "texture",
- "params": [
- "02"
- ]
+ "params": ["02"]
},
{
"name": "color",
@@ -390,27 +331,19 @@
"methods": [
{
"name": "shape",
- "params": [
- "circle"
- ]
+ "params": ["circle"]
},
{
"name": "color",
- "params": [
- "rgba(255,0,0,1.0)"
- ]
+ "params": ["rgba(255,0,0,1.0)"]
},
{
"name": "size",
- "params": [
- 10
- ]
+ "params": [10]
},
{
"name": "animate",
- "params": [
- true
- ]
+ "params": [true]
},
{
"name": "style",
@@ -434,24 +367,17 @@
"methods": [
{
"name": "shape",
- "params": [
- "map_selected"
- ]
+ "params": ["map_selected"]
},
{
"name": "size",
- "params": [
- 30
- ]
+ "params": [30]
},
{
"name": "style",
"params": [
{
- "offsets": [
- 0,
- 0
- ]
+ "offsets": [0, 0]
}
]
}
@@ -468,21 +394,15 @@
"methods": [
{
"name": "shape",
- "params": [
- "line"
- ]
+ "params": ["line"]
},
{
"name": "size",
- "params": [
- 2
- ]
+ "params": [2]
},
{
"name": "color",
- "params": [
- "rgba(189, 209, 150,1)"
- ]
+ "params": ["rgba(189, 209, 150,1)"]
}
]
}
@@ -507,26 +427,9 @@
"key": "hn_kf_hm_pipeline",
"source-layer": "hn_kf_hm_pipeline",
"type": "line",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
- "line-color": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "#1b76ff",
- "ws",
- "#ff4c61",
- "hs",
- "#d8ad4f",
- "#000000"
- ],
+ "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#d8ad4f", "#000000"],
"line-width": 2
},
"layout": {},
@@ -540,16 +443,9 @@
"key": "hubei_xiaogan_hm_city_boundary",
"source-layer": "hubei_xiaogan_hm_city_boundary",
"type": "fill",
- "filter": [
- "in",
- "name",
- ""
- ],
+ "filter": ["in", "name", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ]
+ "fill-color": ["get", "fill_color"]
},
"layout": {},
"minzoom": 10,
@@ -562,16 +458,9 @@
"key": "hubei_xiaogan_hm_psfq",
"source-layer": "hubei_xiaogan_hm_psfq",
"type": "fill",
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
- "fill-color": [
- "get",
- "fill_color"
- ],
+ "fill-color": ["get", "fill_color"],
"fill-opacity": 0.4
},
"layout": {},
@@ -585,36 +474,17 @@
"key": "hn_kf_hm_pipeline_point",
"source-layer": "hn_kf_hm_pipeline_point",
"type": "symbol",
- "filter": [
- "in",
- "类型",
- ""
- ],
+ "filter": ["in", "类型", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
"text-halo-width": 2
},
"layout": {
- "icon-image": [
- "match",
- [
- "get",
- "类型"
- ],
- "ys",
- "ysj",
- "ws",
- "wsj",
- "hs",
- "hsj",
- "ysbz"
- ],
+ "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
"icon-size": 0.5,
"text-field": "{管线点号}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 13,
"text-line-height": 3,
"text-anchor": "top"
@@ -630,11 +500,7 @@
"type": "symbol",
"minzoom": 0,
"maxzoom": 24,
- "filter": [
- "in",
- "type",
- ""
- ],
+ "filter": ["in", "type", ""],
"paint": {
"text-color": "rgba(255, 255, 255, 1)",
"text-halo-color": "rgba(14, 139, 90, 1)",
@@ -643,10 +509,7 @@
"layout": {
"icon-image": [
"match",
- [
- "get",
- "type"
- ],
+ ["get", "type"],
"YSBZ",
"rainBengZhan_icon",
"WSBZ",
@@ -664,6 +527,7 @@
"origine",
"origine_icon",
"spongeFacility",
+ "pipeMonitor",
"spongeFacility_icon",
"waterFactory",
"waterFactory_icon",
@@ -674,192 +538,85 @@
"icon-anchor": "center",
"icon-size": 0.8,
"text-field": "{name}",
- "text-font": [
- "KlokanTech Noto Sans Regular"
- ],
+ "text-font": ["KlokanTech Noto Sans Regular"],
"text-size": 16,
"text-line-height": 3,
"text-anchor": "bottom",
"text-max-width": 50,
- "text-offset": [
- 0,
- -0.8
- ]
+ "text-offset": [0, -0.8]
},
"mType": "geojson"
}
],
"orders": [
- [
- "newfiber-XYZLayer"
- ],
- [
- "hubei_xiaogan_hm_psfq"
- ],
- [
- "city_boundary"
- ],
- [
- "all_boundary"
- ],
- [
- "pipeline_info"
- ],
- [
- "pipeline_point"
- ],
- [
- "poi_label"
- ],
- [
- "place_label_city"
- ],
- [
- "road_major_label"
- ],
- [
- "place_label_other"
- ],
- [
- "point"
- ]
+ ["newfiber-XYZLayer"],
+ ["hubei_xiaogan_hm_psfq"],
+ ["city_boundary"],
+ ["all_boundary"],
+ ["pipeline_info"],
+ ["pipeline_point"],
+ ["poi_label"],
+ ["place_label_city"],
+ ["road_major_label"],
+ ["place_label_other"],
+ ["point"]
],
"filter": {
"wsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ws"
- ],
- [
- "ws"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ws"], ["ws"]]
},
"hsLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "hs"
- ],
- [
- "hs"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["hs"], ["hs"]]
},
"ysLine1": {
- "layerName": [
- "pipeline_info",
- "pipeline_point"
- ],
- "filter": [
- [
- "ys"
- ],
- [
- "ys"
- ]
- ]
+ "layerName": ["pipeline_info", "pipeline_point"],
+ "filter": [["ys"], ["ys"]]
},
"YSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "YS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["YS"]]
},
"WSFQ": {
- "layerName": [
- "hubei_xiaogan_hm_psfq"
- ],
- "filter": [
- [
- "WS"
- ]
- ]
+ "layerName": ["hubei_xiaogan_hm_psfq"],
+ "filter": [["WS"]]
},
"oldCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["老城区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.926
- ],
+ "center": [113.933, 30.926],
"zoom": 13.6,
"pitch": 55
}
},
"southCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "南城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["南城新区"]],
"easeTo": {
- "center": [
- 113.933,
- 30.886
- ],
+ "center": [113.933, 30.886],
"zoom": 13.6,
"pitch": 55
}
},
"newCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区"]],
"easeTo": {
- "center": [
- 113.983,
- 30.896
- ],
+ "center": [113.983, 30.896],
"zoom": 13.6,
"pitch": 55
}
},
"allCity": {
- "layerName": [
- "city_boundary"
- ],
- "filter": [
- [
- "东城新区",
- "南城新区",
- "老城区"
- ]
- ],
+ "layerName": ["city_boundary"],
+ "filter": [["东城新区", "南城新区", "老城区"]],
"easeTo": {
- "center": [
- 113.953,
- 30.906
- ],
+ "center": [113.953, 30.906],
"zoom": 13.6,
"pitch": 55
}
}
}
-}
\ No newline at end of file
+}
diff --git a/public/static/libs/mapbox/style/sprite/sprite3.json b/public/static/libs/mapbox/style/sprite/sprite3.json
index 9b7fcfd..8ef814e 100644
--- a/public/static/libs/mapbox/style/sprite/sprite3.json
+++ b/public/static/libs/mapbox/style/sprite/sprite3.json
@@ -20,7 +20,7 @@
"y": 0,
"pixelRatio": 3
},
- "YQGXMX s": {
+ "YQGXMXs": {
"width": 19,
"height": 17,
"x": 125,
diff --git a/src/assets/newImgs/HMScreen/equip.png b/src/assets/newImgs/HMScreen/equip.png
new file mode 100644
index 0000000..f37ffb1
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/equip.png
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipe.gif b/src/assets/newImgs/HMScreen/pipe.gif
new file mode 100644
index 0000000..3feff46
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipe.gif
Binary files differ
diff --git a/src/assets/newImgs/HMScreen/pipeW.png b/src/assets/newImgs/HMScreen/pipeW.png
new file mode 100644
index 0000000..ac8ce63
--- /dev/null
+++ b/src/assets/newImgs/HMScreen/pipeW.png
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMX s.png b/src/assets/newImgs/layerIcon/YQGXMX s.png
deleted file mode 100644
index e5845d6..0000000
--- a/src/assets/newImgs/layerIcon/YQGXMX s.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/newImgs/layerIcon/YQGXMXs.png b/src/assets/newImgs/layerIcon/YQGXMXs.png
new file mode 100644
index 0000000..e5845d6
--- /dev/null
+++ b/src/assets/newImgs/layerIcon/YQGXMXs.png
Binary files differ
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 5b044f7..db79f45 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -122,7 +122,7 @@
xAxis: [
{
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
axisLabel: {
color: '#00D1FF',
},
@@ -134,9 +134,7 @@
},
// prettier-ignore
- data: [
- ' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00', ' 14:00', ' 15:00', ' 16:00', ' 17:00', ' 18:00', ' 19:00', ' 20:00', ' 21:00', ' 22:00', ' 23:00', '0:00', ' 1:00'
- ],
+ data: [' 2:00', ' 3:00', ' 4:00', ' 5:00', ' 6:00', ' 7:00', ' 8:00', ' 9:00', ' 10:00', ' 11:00', ' 12:00', ' 13:00'],
},
],
yAxis: [
@@ -193,9 +191,7 @@
focus: 'series',
},
// prettier-ignore
- data: [
- 5.5, 5.1, 5.7, 5.9, 6.1, 6.6, 6.3, 6.7, 6.2, 5.8, 5.6, 5.4, 5.2, 5.0, 4.8, 5.3, 5.1, 5.5, 5.2, 5.3, 5.6, 5.8, 6.3, 6.5
- ],
+ data: [ 0.5, 0.1, 0.7, 0.9, 0.1, 0.6, 0.3, 0.7, 0.2, 0.8, 0.6,1.2],
},
{
name: '流量',
@@ -230,7 +226,7 @@
focus: 'series',
},
// prettier-ignore
- data: [10, 13, 13.4, 15, 17, 20, 33, 40, 45, 50, 43.7, 42, 38, 36, 35, 38, 41, 41, 43, 38, 28, 20, 15, 13],
+ data: [2, 1.3, 1.4, 2.5, 1.7, 2.0, 1.3, 1.0, 1.6, 0.9, 0.7, 3.4],
},
],
},
diff --git a/src/views/gisMapPage/LegendDataMain.js b/src/views/gisMapPage/LegendDataMain.js
index f3e3f98..795048a 100644
--- a/src/views/gisMapPage/LegendDataMain.js
+++ b/src/views/gisMapPage/LegendDataMain.js
@@ -165,7 +165,7 @@
// isCheck: false,
// name: '排口监测',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/gisMapPage/commonLegend.js b/src/views/gisMapPage/commonLegend.js
index 3adda70..0b40687 100644
--- a/src/views/gisMapPage/commonLegend.js
+++ b/src/views/gisMapPage/commonLegend.js
@@ -322,7 +322,7 @@
// isCheck: false,
// name: '排口',
// layername: 'PKsupervise',
- // url: 'YQGXMX s.png', //图层+json √
+ // url: 'YQGXMXs.png', //图层+json √
// mapUrl: 'YQGXMX.png',
// type: 'point',
// data: PKsupervise,
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 4190fbf..0dcce8e 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -120,7 +120,7 @@
{ name: '排水防涝', id: 4 },
{ name: '长效运维', id: 5 },
]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
const showPanel = ref(false);
const showLegend = ref(false);
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 218bc07..473dfd0 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -17,6 +17,7 @@
WSCLC,
waterLogingPoint,
projectStation,
+ pipeMonitorData,
ysArea,
wsArea,
hsArea,
@@ -72,6 +73,16 @@
if (projectStationRes && projectStationRes.code == 200) {
projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施
}
+ // 管网监测点 测试用
+ pipeMonitorData = this.getGeojsonData([
+ {
+ projectNo: 'JZGW02',
+ projectName: '汴京路管网监测点',
+ stCode: '2109600028',
+ stName: '汴京路管网监测点',
+ lonlat: '114.3141225,34.79221',
+ },
+ ]);
//发送图例
legendDataList = this.legendData();
bus.emit('cesiumLegendDataList', legendDataList);
@@ -438,6 +449,15 @@
type: 'point',
data: projectStation,
},
+ {
+ isCheck: false,
+ name: '管网监测',
+ layername: 'pipeMonitor',
+ url: 'combineLine_icon.png', //图层+json √
+ mapUrl: 'YQGXMXs.png',
+ type: 'point',
+ data: pipeMonitorData,
+ },
],
],
},
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 4b8ac0e..c2a10a0 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -31,10 +31,18 @@
+
+
+
+
+
+
+
+
+