diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json new file mode 100644 index 0000000..eebe965 --- /dev/null +++ b/src/assets/paishuiSupervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.47463528829778, + 36.60780896340439 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "王家坪旧址门口" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.46886470395586, + 36.60729523067474 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "大砭沟与北大街交叉口" + } + } + ] +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json new file mode 100644 index 0000000..eebe965 --- /dev/null +++ b/src/assets/paishuiSupervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.47463528829778, + 36.60780896340439 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "王家坪旧址门口" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.46886470395586, + 36.60729523067474 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "大砭沟与北大街交叉口" + } + } + ] +} \ No newline at end of file diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json new file mode 100644 index 0000000..f382396 --- /dev/null +++ b/src/assets/ranQi_supervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.4774986436632, + 36.60497748480903 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "延安中学" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.48304674487184, + 36.59982338278728 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "延安大学附属医院" + } + } + ] +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json new file mode 100644 index 0000000..eebe965 --- /dev/null +++ b/src/assets/paishuiSupervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.47463528829778, + 36.60780896340439 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "王家坪旧址门口" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.46886470395586, + 36.60729523067474 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "大砭沟与北大街交叉口" + } + } + ] +} \ No newline at end of file diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json new file mode 100644 index 0000000..f382396 --- /dev/null +++ b/src/assets/ranQi_supervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.4774986436632, + 36.60497748480903 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "延安中学" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.48304674487184, + 36.59982338278728 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "延安大学附属医院" + } + } + ] +} \ No newline at end of file diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4b5e952..a048a7c 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -81,7 +81,7 @@ width: 512, }, }); - if (data && data.data) { + if (data && data.data && data.data.status == 200) { data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; AllData.poiImages.push({ name: element.name, @@ -101,10 +101,11 @@ gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); AllData.poiCircle = position_Street.geometry.coordinates; console.log('🚀 ~ showAllStreet ~ AllData.poiCircle:', AllData.poiCircle); - - AllData.panorama.setPosition( - new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - ); + setTimeout(() => { + AllData.panorama.setPosition( + new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + ); + }, 2000); searchPoiByLonlat(); gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json new file mode 100644 index 0000000..eebe965 --- /dev/null +++ b/src/assets/paishuiSupervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.47463528829778, + 36.60780896340439 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "王家坪旧址门口" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.46886470395586, + 36.60729523067474 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "大砭沟与北大街交叉口" + } + } + ] +} \ No newline at end of file diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json new file mode 100644 index 0000000..f382396 --- /dev/null +++ b/src/assets/ranQi_supervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.4774986436632, + 36.60497748480903 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "延安中学" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.48304674487184, + 36.59982338278728 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "延安大学附属医院" + } + } + ] +} \ No newline at end of file diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4b5e952..a048a7c 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -81,7 +81,7 @@ width: 512, }, }); - if (data && data.data) { + if (data && data.data && data.data.status == 200) { data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; AllData.poiImages.push({ name: element.name, @@ -101,10 +101,11 @@ gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); AllData.poiCircle = position_Street.geometry.coordinates; console.log('🚀 ~ showAllStreet ~ AllData.poiCircle:', AllData.poiCircle); - - AllData.panorama.setPosition( - new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - ); + setTimeout(() => { + AllData.panorama.setPosition( + new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + ); + }, 2000); searchPoiByLonlat(); gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 7d621ab..730c1dc 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -53,6 +53,9 @@ import anXianGaiZao from '@/assets/anXianGaiZao.json'; import testProjection from '@/assets/testProjection.json'; import testProjectionLabel from '@/assets/testProjectionLabel.json'; + +import ranQi_supervise from '@/assets/ranQi_supervise.json'; +import paishuiSupervise from '@/assets/paishuiSupervise.json'; import xtb_img from '@/assets/newImgs/xtb_img.png'; import bus from '@/bus'; import axios from 'axios'; @@ -288,7 +291,7 @@ { layerName: '节点', layerKey: 'rq_jieDian', - layerIcon: requireTuChengImg('tiaoYaQi'), + layerIcon: requireTuChengImg('jiedian_iocn'), layerVisible: false, }, { @@ -445,6 +448,20 @@ layerVisible: false, data: yanAnVideo, }, + { + layerName: '燃气监测', + layerKey: 'ranQi_supervise', + layerIcon: requireTuChengImg('ranQiJing'), + layerVisible: false, + data: ranQi_supervise, + }, + { + layerName: '排水监测', + layerKey: 'paishuiSupervise', + layerIcon: requireTuChengImg('shuiWeiJi_icon'), + layerVisible: false, + data: paishuiSupervise, + }, ], }, ], diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 451ffe1..35db68c 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -5,7 +5,9 @@ "sprites": [ "/static/libs/mapbox/style/sprite/sprite4", "/static/libs/mapbox/style/sprite/sprite5", - "/static/libs/mapbox/style/sprite/sprite6" + "/static/libs/mapbox/style/sprite/sprite6", + "/static/libs/mapbox/style/sprite/sprite7", + "/static/libs/mapbox/style/sprite/sprite8" ], "init": { "center": [ @@ -718,22 +720,22 @@ "devicetype" ], 1, - "wsj", + "weiZhi_iocn", 2, - "wsj", + "weiZhi_iocn", 3, - "rainBengZhan_icon", + "tiaoYaQi_icon", 4, - "hsj", + "jieDian_iocn", 5, - "waterCourse_icon", + "jiXing_iocn", 6, "sewageFactory_icon", 7, - "origine_icon", + "liuLiangJi_iocn", 8, - "waterLoging_icon", - "ysbz" + "weiZhi_iocn", + "weiZhi_iocn" ], "icon-size": 0.65 }, @@ -772,59 +774,33 @@ "error_monitor", "error_monitor", "video", - "SP2", + "shiPinJianCe_icon", "PLBZ", "waiPaiBeng", "paiKou", "paiKou", "YSBZ", - "paiLaoBeng", + "ysBengZhan_icon", "drainOutlet", "DFHZ2", "WSBZ", "wsBeng", "WSCLC", - "WSC", + "WSCLC_icon", "orinign", "orinign", "rainStation", "rain", "pipeSupervise", - "rainSupervise", + "guanWangJianCe_icon", "PKsupervise", - "YQGXMX", + "paiKouJianCe_icon", "yiLaoPoint", - "yiLao", + "yiLaoDian_icon", "fengXianPoint", - "KDJZWMX", + "fengXianDian_icon", "waterSectionInfo", "yuanTous", - "paiKou_1", - "paiKou", - "YSBZ_1", - "paiLaoBeng", - "drainOutlet_1", - "DFHZ2", - "WSBZ_1", - "wsBeng", - "WSCLC_1", - "WSC", - "orinign_1", - "orinign", - "rainStation_1", - "rain", - "pipeSupervise_1", - "rainSupervise", - "PKsupervise_1", - "YQGXMX", - "waterlog_1", - "yiLao", - "riverLake_1", - "KDJZWMX", - "waterSectionInfo_1", - "yuanTou", - "PLBZ_1", - "waiPaiBeng", "HMJZYSQ", "Architectural_icon", "HMXGYLD", @@ -855,6 +831,10 @@ "combineBengZhan_icon", "noDeal_QT", "waterCourse_icon", + "ranQi_supervise", + "ranQiJianCe", + "paishuiSupervise", + "shuiWeuJianCe", "ysbz" ], "text-allow-overlap": false, diff --git a/public/static/libs/mapbox/style/sprite/sprite7.json b/public/static/libs/mapbox/style/sprite/sprite7.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7.png b/public/static/libs/mapbox/style/sprite/sprite7.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.json b/public/static/libs/mapbox/style/sprite/sprite7@2x.json new file mode 100644 index 0000000..27d01da --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.json @@ -0,0 +1,98 @@ +{ + "fengXianDian_icon": { + "x": 10, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "guanWangJianCe_icon": { + "x": 60, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jieDian_iocn": { + "x": 10, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "jiXing_iocn": { + "x": 58, + "y": 60, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "liuLiangJi_iocn": { + "x": 108, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "paiKouJianCe_icon": { + "x": 108, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "shiPinJianCe_icon": { + "x": 10, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "weiZhi_iocn": { + "x": 58, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "WSCLC_icon": { + "x": 106, + "y": 108, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "tiaoYaQi_icon": { + "x": 156, + "y": 10, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "yiLaoDian_icon": { + "x": 156, + "y": 58, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + }, + "ysBengZhan_icon": { + "x": 156, + "y": 106, + "width": 28, + "height": 28, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite7@2x.png b/public/static/libs/mapbox/style/sprite/sprite7@2x.png new file mode 100644 index 0000000..3cedc90 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite7@2x.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8.json b/public/static/libs/mapbox/style/sprite/sprite8.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8.png b/public/static/libs/mapbox/style/sprite/sprite8.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8.png Binary files differ diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.json b/public/static/libs/mapbox/style/sprite/sprite8@2x.json new file mode 100644 index 0000000..5d403b9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.json @@ -0,0 +1,18 @@ +{ + "ranQiJianCe": { + "x": 10, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + }, + "shuiWeuJianCe": { + "x": 56, + "y": 10, + "width": 26, + "height": 26, + "pixelRatio": 1, + "sdf": false + } +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/sprite/sprite8@2x.png b/public/static/libs/mapbox/style/sprite/sprite8@2x.png new file mode 100644 index 0000000..f2f91e9 --- /dev/null +++ b/public/static/libs/mapbox/style/sprite/sprite8@2x.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png new file mode 100644 index 0000000..2486762 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/jiedian_iocn.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png new file mode 100644 index 0000000..ccf68b0 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/ranQiJing.png Binary files differ diff --git a/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png new file mode 100644 index 0000000..be0cb25 --- /dev/null +++ b/src/assets/images/Sponge_screen/TuCheng/shuiWeiJi_icon.png Binary files differ diff --git "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" "b/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" deleted file mode 100644 index 2486762..0000000 --- "a/src/assets/images/Sponge_screen/TuCheng/\350\212\202\347\202\271_iocn.png" +++ /dev/null Binary files differ diff --git a/src/assets/paishuiSupervise.json b/src/assets/paishuiSupervise.json new file mode 100644 index 0000000..eebe965 --- /dev/null +++ b/src/assets/paishuiSupervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.47463528829778, + 36.60780896340439 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "王家坪旧址门口" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.46886470395586, + 36.60729523067474 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "大砭沟与北大街交叉口" + } + } + ] +} \ No newline at end of file diff --git a/src/assets/ranQi_supervise.json b/src/assets/ranQi_supervise.json new file mode 100644 index 0000000..f382396 --- /dev/null +++ b/src/assets/ranQi_supervise.json @@ -0,0 +1,37 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "id": 0, + "geometry": { + "type": "Point", + "coordinates": [ + 109.4774986436632, + 36.60497748480903 + ] + }, + "properties": { + "FID": 0, + "id": 0, + "name": "延安中学" + } + }, + { + "type": "Feature", + "id": 1, + "geometry": { + "type": "Point", + "coordinates": [ + 109.48304674487184, + 36.59982338278728 + ] + }, + "properties": { + "FID": 1, + "id": 1, + "name": "延安大学附属医院" + } + } + ] +} \ No newline at end of file diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index 4b5e952..a048a7c 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -81,7 +81,7 @@ width: 512, }, }); - if (data && data.data) { + if (data && data.data && data.data.status == 200) { data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64; AllData.poiImages.push({ name: element.name, @@ -101,10 +101,11 @@ gcoord.transform(position_Street, gcoord.WGS84, gcoord.BD09); AllData.poiCircle = position_Street.geometry.coordinates; console.log('🚀 ~ showAllStreet ~ AllData.poiCircle:', AllData.poiCircle); - - AllData.panorama.setPosition( - new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) - ); + setTimeout(() => { + AllData.panorama.setPosition( + new BMapGL.Point(position_Street.geometry.coordinates[0], position_Street.geometry.coordinates[1]) + ); + }, 2000); searchPoiByLonlat(); gcoord.transform(position_Street, gcoord.BD09, gcoord.WGS84); diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 7d621ab..730c1dc 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -53,6 +53,9 @@ import anXianGaiZao from '@/assets/anXianGaiZao.json'; import testProjection from '@/assets/testProjection.json'; import testProjectionLabel from '@/assets/testProjectionLabel.json'; + +import ranQi_supervise from '@/assets/ranQi_supervise.json'; +import paishuiSupervise from '@/assets/paishuiSupervise.json'; import xtb_img from '@/assets/newImgs/xtb_img.png'; import bus from '@/bus'; import axios from 'axios'; @@ -288,7 +291,7 @@ { layerName: '节点', layerKey: 'rq_jieDian', - layerIcon: requireTuChengImg('tiaoYaQi'), + layerIcon: requireTuChengImg('jiedian_iocn'), layerVisible: false, }, { @@ -445,6 +448,20 @@ layerVisible: false, data: yanAnVideo, }, + { + layerName: '燃气监测', + layerKey: 'ranQi_supervise', + layerIcon: requireTuChengImg('ranQiJing'), + layerVisible: false, + data: ranQi_supervise, + }, + { + layerName: '排水监测', + layerKey: 'paishuiSupervise', + layerIcon: requireTuChengImg('shuiWeiJi_icon'), + layerVisible: false, + data: paishuiSupervise, + }, ], }, ], diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue index c5a397e..ffc537f 100644 --- a/src/views/oneMap/SmartDrainage/PsRightBox.vue +++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue @@ -17,7 +17,7 @@ {{ item.name }} -