diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..9dfe0c0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..9dfe0c0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..1c2197e --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..9dfe0c0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..1c2197e --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index e1ad207..e2793c4 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -77,6 +77,10 @@ {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"}, {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"}, + {"name": "泵站视频", "url": "/static/libs/mapbox/images/泵站视频_icon.png"}, + {"name": "渍水点视频", "url": "/static/libs/mapbox/images/渍水点视频_icon.png"}, + {"name": "港渠视频", "url": "/static/libs/mapbox/images/港渠视频_icon.png"}, + {"name": "地", "url": "/static/libs/mapbox/images/地.png"}, {"name": "堵", "url": "/static/libs/mapbox/images/堵.png"}, {"name": "异", "url": "/static/libs/mapbox/images/异.png"}, @@ -1209,7 +1213,7 @@ "layout": { "icon-image": [ "match", - ["get", "_image"], + ["get", "_image"], "rain","雨量站扎点@2x", "waterlog_point","排渍调度", "port_channel_info","港渠扎点@2x", @@ -1263,20 +1267,24 @@ "clickPoint", "selectedLocation", "temporary", "selectedLocation", - "QTCL","晴", - "WSHR","混", - "DXSZR","地", + "gangqu_video", "港渠视频", + "water_logging_video", "渍水点视频", + "pump_video", "泵站视频", - "GJMY","溢", - "GWMG","满", - "GWGSWYX","高", - "GJMYFX","溢", + "QTCL","晴", + "WSHR","混", + "DXSZR","地", - "YSHR","混", - "YDFX","堵", - "SZYC","异", + "GJMY","溢", + "GWMG","满", + "GWGSWYX","高", + "GJMYFX","溢", - "tran" + "YSHR","混", + "YDFX","堵", + "SZYC","异", + + "tran" ], "icon-allow-overlap": true, "icon-anchor": "center", @@ -1295,6 +1303,9 @@ "YSHR",0.7, "YDFX",0.7, "SZYC",0.7, + "gangqu_video",0.7, + "water_logging_video",0.7, + "pump_video",0.7, 1 ], "text-field": "{name}", diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..9dfe0c0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..1c2197e --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index e1ad207..e2793c4 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -77,6 +77,10 @@ {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"}, {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"}, + {"name": "泵站视频", "url": "/static/libs/mapbox/images/泵站视频_icon.png"}, + {"name": "渍水点视频", "url": "/static/libs/mapbox/images/渍水点视频_icon.png"}, + {"name": "港渠视频", "url": "/static/libs/mapbox/images/港渠视频_icon.png"}, + {"name": "地", "url": "/static/libs/mapbox/images/地.png"}, {"name": "堵", "url": "/static/libs/mapbox/images/堵.png"}, {"name": "异", "url": "/static/libs/mapbox/images/异.png"}, @@ -1209,7 +1213,7 @@ "layout": { "icon-image": [ "match", - ["get", "_image"], + ["get", "_image"], "rain","雨量站扎点@2x", "waterlog_point","排渍调度", "port_channel_info","港渠扎点@2x", @@ -1263,20 +1267,24 @@ "clickPoint", "selectedLocation", "temporary", "selectedLocation", - "QTCL","晴", - "WSHR","混", - "DXSZR","地", + "gangqu_video", "港渠视频", + "water_logging_video", "渍水点视频", + "pump_video", "泵站视频", - "GJMY","溢", - "GWMG","满", - "GWGSWYX","高", - "GJMYFX","溢", + "QTCL","晴", + "WSHR","混", + "DXSZR","地", - "YSHR","混", - "YDFX","堵", - "SZYC","异", + "GJMY","溢", + "GWMG","满", + "GWGSWYX","高", + "GJMYFX","溢", - "tran" + "YSHR","混", + "YDFX","堵", + "SZYC","异", + + "tran" ], "icon-allow-overlap": true, "icon-anchor": "center", @@ -1295,6 +1303,9 @@ "YSHR",0.7, "YDFX",0.7, "SZYC",0.7, + "gangqu_video",0.7, + "water_logging_video",0.7, + "pump_video",0.7, 1 ], "text-field": "{name}", diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index cf0c595..dc81682 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -154,6 +154,25 @@ ], },*/ { + value: "视频", + label: "视频", + class: "target-class", + children: [ + { + value: "gangqu_video", + label: "港渠视频", + }, + { + value: "water_logging_video", + label: "渍水点视频", + }, + { + value: "pump_video", + label: "泵站视频", + } + ], + }, + { value: "监测点", label: "监测点", class: "target-class", diff --git "a/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..137456f --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\263\265\347\253\231\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..9dfe0c0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\215\346\260\264\347\202\271\350\247\206\351\242\221_icon.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" new file mode 100644 index 0000000..1c2197e --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\270\257\346\270\240\350\247\206\351\242\221_icon.png" Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index e1ad207..e2793c4 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -77,6 +77,10 @@ {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"}, {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"}, + {"name": "泵站视频", "url": "/static/libs/mapbox/images/泵站视频_icon.png"}, + {"name": "渍水点视频", "url": "/static/libs/mapbox/images/渍水点视频_icon.png"}, + {"name": "港渠视频", "url": "/static/libs/mapbox/images/港渠视频_icon.png"}, + {"name": "地", "url": "/static/libs/mapbox/images/地.png"}, {"name": "堵", "url": "/static/libs/mapbox/images/堵.png"}, {"name": "异", "url": "/static/libs/mapbox/images/异.png"}, @@ -1209,7 +1213,7 @@ "layout": { "icon-image": [ "match", - ["get", "_image"], + ["get", "_image"], "rain","雨量站扎点@2x", "waterlog_point","排渍调度", "port_channel_info","港渠扎点@2x", @@ -1263,20 +1267,24 @@ "clickPoint", "selectedLocation", "temporary", "selectedLocation", - "QTCL","晴", - "WSHR","混", - "DXSZR","地", + "gangqu_video", "港渠视频", + "water_logging_video", "渍水点视频", + "pump_video", "泵站视频", - "GJMY","溢", - "GWMG","满", - "GWGSWYX","高", - "GJMYFX","溢", + "QTCL","晴", + "WSHR","混", + "DXSZR","地", - "YSHR","混", - "YDFX","堵", - "SZYC","异", + "GJMY","溢", + "GWMG","满", + "GWGSWYX","高", + "GJMYFX","溢", - "tran" + "YSHR","混", + "YDFX","堵", + "SZYC","异", + + "tran" ], "icon-allow-overlap": true, "icon-anchor": "center", @@ -1295,6 +1303,9 @@ "YSHR",0.7, "YDFX",0.7, "SZYC",0.7, + "gangqu_video",0.7, + "water_logging_video",0.7, + "pump_video",0.7, 1 ], "text-field": "{name}", diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index cf0c595..dc81682 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -154,6 +154,25 @@ ], },*/ { + value: "视频", + label: "视频", + class: "target-class", + children: [ + { + value: "gangqu_video", + label: "港渠视频", + }, + { + value: "water_logging_video", + label: "渍水点视频", + }, + { + value: "pump_video", + label: "泵站视频", + } + ], + }, + { value: "监测点", label: "监测点", class: "target-class", diff --git a/vite.config.js b/vite.config.js index dbc197c..4ddbb34 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,7 +5,7 @@ import autoprefixer from 'autoprefixer'; const Timestamp = new Date().getTime(); //随机时间戳 -let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api'; +let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; // let ipLink = 'http://192.168.16.124:9100'; // let ipLink = 'http://192.168.20.43:9100'; // 刘总