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 }} -
+
序号 @@ -29,16 +29,12 @@
{{ item.xh }} - {{ item.hd }} + {{ item.hd }} {{ item.dqsw }} {{ item.kzsw }} 正常 - 超控制常水位 @@ -46,39 +42,28 @@
-
河湖简介:延河
+
河湖简介:{{ HhName }}
- 延河为黄河右岸一级支流,发源于陕西省靖边县天赐湾乡周山南麓,经安塞县镰刀湾乡杨石寺村附近进人延安境内,自西北流向东南,经安塞、宝塔、延长等县(区),于延长南河沟乡凉水岸汇人黄河。延河全长286.9km,流城面积7725 - km?,平均比降3.3%。市内河长248.5 km,市内面积7321 - km?,主要支流有杏子河、坪桥川、西川河、南川河、蟠龙川等。 + {{ hdJj }}
    -
  • +
  • 站点名称:
    {{ i.siteName }}
    - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
    深:
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析:
    @@ -94,28 +79,19 @@
      -
    • +
    • 站点名称:
      {{ i.siteName }}
      - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
      深:
      -
      - {{ i.z || 0 }}米 -
      +
      {{ i.z || 0 }}米
      风险分析:
      @@ -144,29 +120,16 @@ 状态 操作
      - +
      {{ item.wranLocation }} {{ item.riskProfile }} {{ item.assessment }} - 派单 - 已派单 + 已派单
      @@ -203,10 +166,7 @@
- +
@@ -228,8 +188,8 @@ const FXJCData = ref([ { - xh: "1", - hd: "延河", + xh: '1', + hd: '延河', dqsw: 130, kzsw: 2000, zt: "超控制常水位", @@ -237,8 +197,8 @@ position:[109.497341,36.603151], }, { - xh: "2", - hd: "杜甫川河", + xh: '2', + hd: '杜甫川河', dqsw: 10, kzsw: 300, zt: "正常", @@ -246,8 +206,8 @@ position:[109.417646,36.571427], }, { - xh: "3", - hd: "西川河", + xh: '3', + hd: '西川河', dqsw: 11, kzsw: 700, zt: "正常", @@ -255,8 +215,8 @@ position:[109.383491,36.634602], }, { - xh: "4", - hd: "南川河", + xh: '4', + hd: '南川河', dqsw: 12, kzsw: 700, zt: "正常", @@ -322,43 +282,46 @@ // }, ]); const yearList = ref([ - { name: "月", value: 1 }, - { name: "年", value: 2 }, + { name: '月', value: 1 }, + { name: '年', value: 2 }, ]); const monitorData = ref([ - { name: "漫溢监测(1/29)", value: 1 }, - { name: "积水监测(0/16)", value: 2 }, - { name: "水位监测(0/4)", value: 2 }, + { name: '积水监测(0/16)', value: 2 }, + { name: '漫溢监测(1/29)', value: 1 }, + { name: '流量监测(0/4)', value: 2 }, ]); const chartData2 = ref({ - xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"], + xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'], refresh: 1, }); -const activedname = ref("月"); -const monitorname = ref("漫溢监测(1/29)"); +const HhName = ref('延河'); +const hdJj = ref( + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。' +); +const activedname = ref('月'); +const monitorname = ref('漫溢监测(1/29)'); function yearclick(val) { activedname.value = val.name; } - function monitorclick(val) { monitorname.value = val.name; - if (monitorname.value == "漫溢监测(1/29)") { + if (monitorname.value == '漫溢监测(1/29)') { listData.value = [ { - siteName: "东关大街与长青路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101612", + siteName: '东关大街与长青路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101612', }, { - siteName: "大桥街与延河西路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101613", + siteName: '大桥街与延河西路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101613', }, { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; - } else if (monitorname.value == "积水监测(0/16)") { + } else if (monitorname.value == '积水监测(0/16)') { listData.value = jsjcData.value; // listData.value = [ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险' }, @@ -366,12 +329,12 @@ // // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, // ]; } else { - console.log(monitorname.value, " monitorname.value"); + console.log(monitorname.value, ' monitorname.value'); } } // 弹框 function showMapDalog(val) { - console.log("val.siteName", val); + console.log('val.siteName', val); useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { @@ -381,15 +344,15 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 积水弹框 function JSshowMapDalog(val) { - console.log("🚀 ~ JSshowMapDalog ~ val:", val); + console.log('🚀 ~ JSshowMapDalog ~ val:', val); // let data = { // title: val.siteName, // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 @@ -404,50 +367,50 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { // console.log('🚀 ~ getTabsList ~ res:', res); data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 派单 -const paidan = (item) => { +const paidan = item => { let data = { title: item.wranLocation, - comIDs: ["gdpf"], + comIDs: ['gdpf'], getSiteId: item.id, }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }; // 超控制常水位 function showcswDalog(val) { - console.log(val, "val"); + console.log(val, 'val'); let data = { - title: val.hd + "监测点", - comIDs: ["PS_ckzcsw"], + title: val.hd + '监测点', + comIDs: ['PS_ckzcsw'], }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); // showPipe.value = true; } // 获取实时预警列表 const getRealTimeWarning = async () => { try { - const res = await commonWarningList({ moduleType: "drainage" }); + const res = await commonWarningList({ moduleType: 'drainage' }); SSYJData.value = res.data; // console.log('🚀 ~ getCommonWarningList ~ res:', res); } catch (error) { - console.log("🚀 ~ getCommonWarningList ~ error:", error); + console.log('🚀 ~ getCommonWarningList ~ error:', error); } }; // 获取站点弹窗 tab列表 -const getTabsList = async (siteNo) => { +const getTabsList = async siteNo => { try { const res = await selectBoxBySiteNo(siteNo); - const tabsList = res.data.boxList.map((item) => item.boxId); + const tabsList = res.data.boxList.map(item => item.boxId); return tabsList; } catch (error) { console.log(" ~ getTabsList ~ error:", error); @@ -458,22 +421,40 @@ const getWaterlogging = async () => { try { const res = await selectSiteMonitorBySiteType({ - monitorTargetType: "waterlogging", - orderBy: "online_status asc", - siteType: "water_level", + monitorTargetType: 'waterlogging', + orderBy: 'online_status asc', + siteType: 'water_level', }); jsjcData.value = res.data; // console.log('🚀 ~ getWaterlogging ~ res:', res); } catch (error) { - console.log("🚀 ~ getWaterlogging ~ error:", error); + console.log('🚀 ~ getWaterlogging ~ error:', error); } }; // 展示四色图 -const ShowSiSetu = (bol) => { - bus.emit("SetLayerShow", ["排水风险评估"]); +const ShowSiSetu = bol => { + bus.emit('SetLayerShow', ['排水风险评估']); // bus.emit("SiSeTuBol", true); }; +// 河道点击 +const WzTrigger = val => { + HhName.value = val; + if (val == '延河') { + hdJj.value = + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。'; + } else if (val == '杜甫川河') { + hdJj.value = + '杜甫川河发源于延安市佛道坪,自西向东流经万花,在延安市马家湾汇入南川河,为南川河的一级支流,河长21km,流域面积166km2,河道平均比降9.3‰,多年平均径流量0.04 亿m 3,最大流量100m3 /s,流量最小时河道断流,河谷狭窄,宽度200~300m,最宽约400m。阶地零星分布,阶面倾向河床,川地高程一般在975~1000m。左岸岸坡低缓,坡高在75m 左右,坡度小于40°;右岸斜坡坡高 50~100m,坡度30°~50°,多为黄土斜坡。'; + } else if (val == '西川河') { + hdJj.value = + '西川河为延河一级支流,发源于安塞区李盆窑子,自西向东流经安塞县的砖窑湾镇高桥乡,在延安市枣园以东、延安兰家坪桥下游汇入延河。西川河流域面积801.1km2,河长61.5km,河道平均比降5.7‰, 多年平均径流量0.29亿m3,最大流量440m3/s,最小流量 0.001m3/s。西川河下游设有枣园水文站,距河口 13km,枣园水文站以上控制流量面积719km2。西川河河谷在横剖面上呈宽阔的“U”型,宽度一般为400~500m,最大宽度700m;川地高950~965m,河床稍向下游倾斜,受水流影响,河床两岸阶地呈不对称,凸岸阶地发育,阶面微向河床倾斜,凹岸很少有阶地。'; + } else { + hdJj.value = + '南川河发源于延安市元庄,自南向北流径柳林镇,在宝塔山下附近入延河,属延河一级支流,河长24.2km,流域面积432.5km2,河道平均比降9.6‰,多年平均径流量0.15亿m 3,最大流量650m3 /s,流量最小时南川河断流。南川河河谷相对较窄,宽度为450m 左右,川地高程960~990m,阶地不甚发育,河床向两侧以缓坡形式过度到两岸斜坡;宝塔山至七里铺段,河谷两岸斜坡高度多在50~100m,坡度普遍大于40°,部分达70°;由于河流14下切,基岩出露,在左右岸坡脚处分别形成 10~20m 和 10~30m的基岩陡坎,坡角普遍大于 80°。在七里铺至柳林河段,岸坡明显减缓,坡度多小于40°,坡高在50m以上。'; + } +}; + onMounted(() => { // 获取预警列表 getRealTimeWarning(); @@ -507,7 +488,7 @@ width: 132px; height: 30px; padding: 2px 3px; - background: url("@/assets/images/zhps/fxpgw.png") no-repeat; + background: url('@/assets/images/zhps/fxpgw.png') no-repeat; background-size: 100% 100%; text-align: center; margin-top: 5px; @@ -516,7 +497,7 @@ .activedright { border: 1px solid #2cfce9; color: #e4f5ff; - background: url("@/assets/images/zhps/fxpgxz.png") no-repeat; + background: url('@/assets/images/zhps/fxpgxz.png') no-repeat; background-size: 100% 100%; } } @@ -688,6 +669,7 @@ line-height: 34px; text-align: center; width: 15%; + cursor: pointer; } .tableBodyList_span3 { font-family: Source Han Sans CN; @@ -922,7 +904,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; 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 }}
-
+
序号 @@ -29,16 +29,12 @@
{{ item.xh }} - {{ item.hd }} + {{ item.hd }} {{ item.dqsw }} {{ item.kzsw }} 正常 - 超控制常水位 @@ -46,39 +42,28 @@
-
河湖简介:延河
+
河湖简介:{{ HhName }}
- 延河为黄河右岸一级支流,发源于陕西省靖边县天赐湾乡周山南麓,经安塞县镰刀湾乡杨石寺村附近进人延安境内,自西北流向东南,经安塞、宝塔、延长等县(区),于延长南河沟乡凉水岸汇人黄河。延河全长286.9km,流城面积7725 - km?,平均比降3.3%。市内河长248.5 km,市内面积7321 - km?,主要支流有杏子河、坪桥川、西川河、南川河、蟠龙川等。 + {{ hdJj }}
    -
  • +
  • 站点名称:
    {{ i.siteName }}
    - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
    深:
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析:
    @@ -94,28 +79,19 @@
      -
    • +
    • 站点名称:
      {{ i.siteName }}
      - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
      深:
      -
      - {{ i.z || 0 }}米 -
      +
      {{ i.z || 0 }}米
      风险分析:
      @@ -144,29 +120,16 @@ 状态 操作
      - +
      {{ item.wranLocation }} {{ item.riskProfile }} {{ item.assessment }} - 派单 - 已派单 + 已派单
      @@ -203,10 +166,7 @@
- +
@@ -228,8 +188,8 @@ const FXJCData = ref([ { - xh: "1", - hd: "延河", + xh: '1', + hd: '延河', dqsw: 130, kzsw: 2000, zt: "超控制常水位", @@ -237,8 +197,8 @@ position:[109.497341,36.603151], }, { - xh: "2", - hd: "杜甫川河", + xh: '2', + hd: '杜甫川河', dqsw: 10, kzsw: 300, zt: "正常", @@ -246,8 +206,8 @@ position:[109.417646,36.571427], }, { - xh: "3", - hd: "西川河", + xh: '3', + hd: '西川河', dqsw: 11, kzsw: 700, zt: "正常", @@ -255,8 +215,8 @@ position:[109.383491,36.634602], }, { - xh: "4", - hd: "南川河", + xh: '4', + hd: '南川河', dqsw: 12, kzsw: 700, zt: "正常", @@ -322,43 +282,46 @@ // }, ]); const yearList = ref([ - { name: "月", value: 1 }, - { name: "年", value: 2 }, + { name: '月', value: 1 }, + { name: '年', value: 2 }, ]); const monitorData = ref([ - { name: "漫溢监测(1/29)", value: 1 }, - { name: "积水监测(0/16)", value: 2 }, - { name: "水位监测(0/4)", value: 2 }, + { name: '积水监测(0/16)', value: 2 }, + { name: '漫溢监测(1/29)', value: 1 }, + { name: '流量监测(0/4)', value: 2 }, ]); const chartData2 = ref({ - xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"], + xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'], refresh: 1, }); -const activedname = ref("月"); -const monitorname = ref("漫溢监测(1/29)"); +const HhName = ref('延河'); +const hdJj = ref( + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。' +); +const activedname = ref('月'); +const monitorname = ref('漫溢监测(1/29)'); function yearclick(val) { activedname.value = val.name; } - function monitorclick(val) { monitorname.value = val.name; - if (monitorname.value == "漫溢监测(1/29)") { + if (monitorname.value == '漫溢监测(1/29)') { listData.value = [ { - siteName: "东关大街与长青路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101612", + siteName: '东关大街与长青路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101612', }, { - siteName: "大桥街与延河西路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101613", + siteName: '大桥街与延河西路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101613', }, { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; - } else if (monitorname.value == "积水监测(0/16)") { + } else if (monitorname.value == '积水监测(0/16)') { listData.value = jsjcData.value; // listData.value = [ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险' }, @@ -366,12 +329,12 @@ // // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, // ]; } else { - console.log(monitorname.value, " monitorname.value"); + console.log(monitorname.value, ' monitorname.value'); } } // 弹框 function showMapDalog(val) { - console.log("val.siteName", val); + console.log('val.siteName', val); useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { @@ -381,15 +344,15 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 积水弹框 function JSshowMapDalog(val) { - console.log("🚀 ~ JSshowMapDalog ~ val:", val); + console.log('🚀 ~ JSshowMapDalog ~ val:', val); // let data = { // title: val.siteName, // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 @@ -404,50 +367,50 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { // console.log('🚀 ~ getTabsList ~ res:', res); data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 派单 -const paidan = (item) => { +const paidan = item => { let data = { title: item.wranLocation, - comIDs: ["gdpf"], + comIDs: ['gdpf'], getSiteId: item.id, }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }; // 超控制常水位 function showcswDalog(val) { - console.log(val, "val"); + console.log(val, 'val'); let data = { - title: val.hd + "监测点", - comIDs: ["PS_ckzcsw"], + title: val.hd + '监测点', + comIDs: ['PS_ckzcsw'], }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); // showPipe.value = true; } // 获取实时预警列表 const getRealTimeWarning = async () => { try { - const res = await commonWarningList({ moduleType: "drainage" }); + const res = await commonWarningList({ moduleType: 'drainage' }); SSYJData.value = res.data; // console.log('🚀 ~ getCommonWarningList ~ res:', res); } catch (error) { - console.log("🚀 ~ getCommonWarningList ~ error:", error); + console.log('🚀 ~ getCommonWarningList ~ error:', error); } }; // 获取站点弹窗 tab列表 -const getTabsList = async (siteNo) => { +const getTabsList = async siteNo => { try { const res = await selectBoxBySiteNo(siteNo); - const tabsList = res.data.boxList.map((item) => item.boxId); + const tabsList = res.data.boxList.map(item => item.boxId); return tabsList; } catch (error) { console.log(" ~ getTabsList ~ error:", error); @@ -458,22 +421,40 @@ const getWaterlogging = async () => { try { const res = await selectSiteMonitorBySiteType({ - monitorTargetType: "waterlogging", - orderBy: "online_status asc", - siteType: "water_level", + monitorTargetType: 'waterlogging', + orderBy: 'online_status asc', + siteType: 'water_level', }); jsjcData.value = res.data; // console.log('🚀 ~ getWaterlogging ~ res:', res); } catch (error) { - console.log("🚀 ~ getWaterlogging ~ error:", error); + console.log('🚀 ~ getWaterlogging ~ error:', error); } }; // 展示四色图 -const ShowSiSetu = (bol) => { - bus.emit("SetLayerShow", ["排水风险评估"]); +const ShowSiSetu = bol => { + bus.emit('SetLayerShow', ['排水风险评估']); // bus.emit("SiSeTuBol", true); }; +// 河道点击 +const WzTrigger = val => { + HhName.value = val; + if (val == '延河') { + hdJj.value = + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。'; + } else if (val == '杜甫川河') { + hdJj.value = + '杜甫川河发源于延安市佛道坪,自西向东流经万花,在延安市马家湾汇入南川河,为南川河的一级支流,河长21km,流域面积166km2,河道平均比降9.3‰,多年平均径流量0.04 亿m 3,最大流量100m3 /s,流量最小时河道断流,河谷狭窄,宽度200~300m,最宽约400m。阶地零星分布,阶面倾向河床,川地高程一般在975~1000m。左岸岸坡低缓,坡高在75m 左右,坡度小于40°;右岸斜坡坡高 50~100m,坡度30°~50°,多为黄土斜坡。'; + } else if (val == '西川河') { + hdJj.value = + '西川河为延河一级支流,发源于安塞区李盆窑子,自西向东流经安塞县的砖窑湾镇高桥乡,在延安市枣园以东、延安兰家坪桥下游汇入延河。西川河流域面积801.1km2,河长61.5km,河道平均比降5.7‰, 多年平均径流量0.29亿m3,最大流量440m3/s,最小流量 0.001m3/s。西川河下游设有枣园水文站,距河口 13km,枣园水文站以上控制流量面积719km2。西川河河谷在横剖面上呈宽阔的“U”型,宽度一般为400~500m,最大宽度700m;川地高950~965m,河床稍向下游倾斜,受水流影响,河床两岸阶地呈不对称,凸岸阶地发育,阶面微向河床倾斜,凹岸很少有阶地。'; + } else { + hdJj.value = + '南川河发源于延安市元庄,自南向北流径柳林镇,在宝塔山下附近入延河,属延河一级支流,河长24.2km,流域面积432.5km2,河道平均比降9.6‰,多年平均径流量0.15亿m 3,最大流量650m3 /s,流量最小时南川河断流。南川河河谷相对较窄,宽度为450m 左右,川地高程960~990m,阶地不甚发育,河床向两侧以缓坡形式过度到两岸斜坡;宝塔山至七里铺段,河谷两岸斜坡高度多在50~100m,坡度普遍大于40°,部分达70°;由于河流14下切,基岩出露,在左右岸坡脚处分别形成 10~20m 和 10~30m的基岩陡坎,坡角普遍大于 80°。在七里铺至柳林河段,岸坡明显减缓,坡度多小于40°,坡高在50m以上。'; + } +}; + onMounted(() => { // 获取预警列表 getRealTimeWarning(); @@ -507,7 +488,7 @@ width: 132px; height: 30px; padding: 2px 3px; - background: url("@/assets/images/zhps/fxpgw.png") no-repeat; + background: url('@/assets/images/zhps/fxpgw.png') no-repeat; background-size: 100% 100%; text-align: center; margin-top: 5px; @@ -516,7 +497,7 @@ .activedright { border: 1px solid #2cfce9; color: #e4f5ff; - background: url("@/assets/images/zhps/fxpgxz.png") no-repeat; + background: url('@/assets/images/zhps/fxpgxz.png') no-repeat; background-size: 100% 100%; } } @@ -688,6 +669,7 @@ line-height: 34px; text-align: center; width: 15%; + cursor: pointer; } .tableBodyList_span3 { font-family: Source Han Sans CN; @@ -922,7 +904,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 3581ddd..31ea2b6 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -5,20 +5,14 @@
延安市城市生命线安全运行监测系统
- + 延安
@@ -37,15 +31,9 @@
- + - + @@ -84,11 +72,7 @@ :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']" v-if="AllData.MapShowBol" /> - + - + - + - + - - + - + - + - +
@@ -160,11 +115,7 @@ -
+
序号 @@ -29,16 +29,12 @@
{{ item.xh }} - {{ item.hd }} + {{ item.hd }} {{ item.dqsw }} {{ item.kzsw }} 正常 - 超控制常水位 @@ -46,39 +42,28 @@
-
河湖简介:延河
+
河湖简介:{{ HhName }}
- 延河为黄河右岸一级支流,发源于陕西省靖边县天赐湾乡周山南麓,经安塞县镰刀湾乡杨石寺村附近进人延安境内,自西北流向东南,经安塞、宝塔、延长等县(区),于延长南河沟乡凉水岸汇人黄河。延河全长286.9km,流城面积7725 - km?,平均比降3.3%。市内河长248.5 km,市内面积7321 - km?,主要支流有杏子河、坪桥川、西川河、南川河、蟠龙川等。 + {{ hdJj }}
    -
  • +
  • 站点名称:
    {{ i.siteName }}
    - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
    深:
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析:
    @@ -94,28 +79,19 @@
      -
    • +
    • 站点名称:
      {{ i.siteName }}
      - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
      深:
      -
      - {{ i.z || 0 }}米 -
      +
      {{ i.z || 0 }}米
      风险分析:
      @@ -144,29 +120,16 @@ 状态 操作
      - +
      {{ item.wranLocation }} {{ item.riskProfile }} {{ item.assessment }} - 派单 - 已派单 + 已派单
      @@ -203,10 +166,7 @@
- +
@@ -228,8 +188,8 @@ const FXJCData = ref([ { - xh: "1", - hd: "延河", + xh: '1', + hd: '延河', dqsw: 130, kzsw: 2000, zt: "超控制常水位", @@ -237,8 +197,8 @@ position:[109.497341,36.603151], }, { - xh: "2", - hd: "杜甫川河", + xh: '2', + hd: '杜甫川河', dqsw: 10, kzsw: 300, zt: "正常", @@ -246,8 +206,8 @@ position:[109.417646,36.571427], }, { - xh: "3", - hd: "西川河", + xh: '3', + hd: '西川河', dqsw: 11, kzsw: 700, zt: "正常", @@ -255,8 +215,8 @@ position:[109.383491,36.634602], }, { - xh: "4", - hd: "南川河", + xh: '4', + hd: '南川河', dqsw: 12, kzsw: 700, zt: "正常", @@ -322,43 +282,46 @@ // }, ]); const yearList = ref([ - { name: "月", value: 1 }, - { name: "年", value: 2 }, + { name: '月', value: 1 }, + { name: '年', value: 2 }, ]); const monitorData = ref([ - { name: "漫溢监测(1/29)", value: 1 }, - { name: "积水监测(0/16)", value: 2 }, - { name: "水位监测(0/4)", value: 2 }, + { name: '积水监测(0/16)', value: 2 }, + { name: '漫溢监测(1/29)', value: 1 }, + { name: '流量监测(0/4)', value: 2 }, ]); const chartData2 = ref({ - xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"], + xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'], refresh: 1, }); -const activedname = ref("月"); -const monitorname = ref("漫溢监测(1/29)"); +const HhName = ref('延河'); +const hdJj = ref( + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。' +); +const activedname = ref('月'); +const monitorname = ref('漫溢监测(1/29)'); function yearclick(val) { activedname.value = val.name; } - function monitorclick(val) { monitorname.value = val.name; - if (monitorname.value == "漫溢监测(1/29)") { + if (monitorname.value == '漫溢监测(1/29)') { listData.value = [ { - siteName: "东关大街与长青路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101612", + siteName: '东关大街与长青路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101612', }, { - siteName: "大桥街与延河西路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101613", + siteName: '大桥街与延河西路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101613', }, { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; - } else if (monitorname.value == "积水监测(0/16)") { + } else if (monitorname.value == '积水监测(0/16)') { listData.value = jsjcData.value; // listData.value = [ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险' }, @@ -366,12 +329,12 @@ // // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, // ]; } else { - console.log(monitorname.value, " monitorname.value"); + console.log(monitorname.value, ' monitorname.value'); } } // 弹框 function showMapDalog(val) { - console.log("val.siteName", val); + console.log('val.siteName', val); useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { @@ -381,15 +344,15 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 积水弹框 function JSshowMapDalog(val) { - console.log("🚀 ~ JSshowMapDalog ~ val:", val); + console.log('🚀 ~ JSshowMapDalog ~ val:', val); // let data = { // title: val.siteName, // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 @@ -404,50 +367,50 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { // console.log('🚀 ~ getTabsList ~ res:', res); data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 派单 -const paidan = (item) => { +const paidan = item => { let data = { title: item.wranLocation, - comIDs: ["gdpf"], + comIDs: ['gdpf'], getSiteId: item.id, }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }; // 超控制常水位 function showcswDalog(val) { - console.log(val, "val"); + console.log(val, 'val'); let data = { - title: val.hd + "监测点", - comIDs: ["PS_ckzcsw"], + title: val.hd + '监测点', + comIDs: ['PS_ckzcsw'], }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); // showPipe.value = true; } // 获取实时预警列表 const getRealTimeWarning = async () => { try { - const res = await commonWarningList({ moduleType: "drainage" }); + const res = await commonWarningList({ moduleType: 'drainage' }); SSYJData.value = res.data; // console.log('🚀 ~ getCommonWarningList ~ res:', res); } catch (error) { - console.log("🚀 ~ getCommonWarningList ~ error:", error); + console.log('🚀 ~ getCommonWarningList ~ error:', error); } }; // 获取站点弹窗 tab列表 -const getTabsList = async (siteNo) => { +const getTabsList = async siteNo => { try { const res = await selectBoxBySiteNo(siteNo); - const tabsList = res.data.boxList.map((item) => item.boxId); + const tabsList = res.data.boxList.map(item => item.boxId); return tabsList; } catch (error) { console.log(" ~ getTabsList ~ error:", error); @@ -458,22 +421,40 @@ const getWaterlogging = async () => { try { const res = await selectSiteMonitorBySiteType({ - monitorTargetType: "waterlogging", - orderBy: "online_status asc", - siteType: "water_level", + monitorTargetType: 'waterlogging', + orderBy: 'online_status asc', + siteType: 'water_level', }); jsjcData.value = res.data; // console.log('🚀 ~ getWaterlogging ~ res:', res); } catch (error) { - console.log("🚀 ~ getWaterlogging ~ error:", error); + console.log('🚀 ~ getWaterlogging ~ error:', error); } }; // 展示四色图 -const ShowSiSetu = (bol) => { - bus.emit("SetLayerShow", ["排水风险评估"]); +const ShowSiSetu = bol => { + bus.emit('SetLayerShow', ['排水风险评估']); // bus.emit("SiSeTuBol", true); }; +// 河道点击 +const WzTrigger = val => { + HhName.value = val; + if (val == '延河') { + hdJj.value = + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。'; + } else if (val == '杜甫川河') { + hdJj.value = + '杜甫川河发源于延安市佛道坪,自西向东流经万花,在延安市马家湾汇入南川河,为南川河的一级支流,河长21km,流域面积166km2,河道平均比降9.3‰,多年平均径流量0.04 亿m 3,最大流量100m3 /s,流量最小时河道断流,河谷狭窄,宽度200~300m,最宽约400m。阶地零星分布,阶面倾向河床,川地高程一般在975~1000m。左岸岸坡低缓,坡高在75m 左右,坡度小于40°;右岸斜坡坡高 50~100m,坡度30°~50°,多为黄土斜坡。'; + } else if (val == '西川河') { + hdJj.value = + '西川河为延河一级支流,发源于安塞区李盆窑子,自西向东流经安塞县的砖窑湾镇高桥乡,在延安市枣园以东、延安兰家坪桥下游汇入延河。西川河流域面积801.1km2,河长61.5km,河道平均比降5.7‰, 多年平均径流量0.29亿m3,最大流量440m3/s,最小流量 0.001m3/s。西川河下游设有枣园水文站,距河口 13km,枣园水文站以上控制流量面积719km2。西川河河谷在横剖面上呈宽阔的“U”型,宽度一般为400~500m,最大宽度700m;川地高950~965m,河床稍向下游倾斜,受水流影响,河床两岸阶地呈不对称,凸岸阶地发育,阶面微向河床倾斜,凹岸很少有阶地。'; + } else { + hdJj.value = + '南川河发源于延安市元庄,自南向北流径柳林镇,在宝塔山下附近入延河,属延河一级支流,河长24.2km,流域面积432.5km2,河道平均比降9.6‰,多年平均径流量0.15亿m 3,最大流量650m3 /s,流量最小时南川河断流。南川河河谷相对较窄,宽度为450m 左右,川地高程960~990m,阶地不甚发育,河床向两侧以缓坡形式过度到两岸斜坡;宝塔山至七里铺段,河谷两岸斜坡高度多在50~100m,坡度普遍大于40°,部分达70°;由于河流14下切,基岩出露,在左右岸坡脚处分别形成 10~20m 和 10~30m的基岩陡坎,坡角普遍大于 80°。在七里铺至柳林河段,岸坡明显减缓,坡度多小于40°,坡高在50m以上。'; + } +}; + onMounted(() => { // 获取预警列表 getRealTimeWarning(); @@ -507,7 +488,7 @@ width: 132px; height: 30px; padding: 2px 3px; - background: url("@/assets/images/zhps/fxpgw.png") no-repeat; + background: url('@/assets/images/zhps/fxpgw.png') no-repeat; background-size: 100% 100%; text-align: center; margin-top: 5px; @@ -516,7 +497,7 @@ .activedright { border: 1px solid #2cfce9; color: #e4f5ff; - background: url("@/assets/images/zhps/fxpgxz.png") no-repeat; + background: url('@/assets/images/zhps/fxpgxz.png') no-repeat; background-size: 100% 100%; } } @@ -688,6 +669,7 @@ line-height: 34px; text-align: center; width: 15%; + cursor: pointer; } .tableBodyList_span3 { font-family: Source Han Sans CN; @@ -922,7 +904,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 3581ddd..31ea2b6 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -5,20 +5,14 @@
延安市城市生命线安全运行监测系统
- + 延安
@@ -37,15 +31,9 @@
- + - + @@ -84,11 +72,7 @@ :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']" v-if="AllData.MapShowBol" /> - + - + - + - + - - + - + - + - +
@@ -160,11 +115,7 @@ @@ -63,40 +63,55 @@ import jgwyj_icon from '@/assets/tunnelImg/jgwyj_icon.png'; import tjy_icon from '@/assets/tunnelImg/tjy_icon.png'; import ybj_icon from '@/assets/tunnelImg/ybj_icon.png'; - +import jlszy_icon from '@/assets/qiaoliangImg/jlszy.png'; const introduce = '延安市杨家岭隧道位于延安市中心城区西北部,走向大致由南向北。项目起点位于延安市拟建的延师桥北桥头、并与现有的延安市枣园路相交,路线向北穿杨家岭隧道至杨家岭沟内、与拟建的延安市杨家岭道路相交。路线全长0.911公里、其中隧道775米。'; -const videoList = [jk_01, jk_02, jk_03, jk_04]; +const videoList = [ + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji1.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji2.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji3.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji4.mp4', + }, +]; const shebeiList = [ { name: ['激光位移计'], icon: jgwyj_icon, - num: 27, + num: '2/27', }, + + { + name: ['静力水准仪'], + icon: jlszy_icon, + num: '2/2', + }, + { name: ['光纤光栅', '应变计'], icon: ybj_icon, - num: 45, + num: '1/45', }, { name: ['光纤光栅', '调节仪'], icon: tjy_icon, - num: 5, + num: '0/5', }, { name: ['光纤光栅', '裂缝计'], icon: lfj_icon, - num: 27, + num: '1/27', }, { name: ['智能球形', '摄像机'], icon: sxj_icon, - num: 4, - }, - { - name: ['其他'], - icon: qt_icon, - num: 0, + num: '0/4', }, ]; @@ -236,7 +251,7 @@ // border: 1px solid red; width: 206px; height: 104px; - img { + #videoEvent { width: 100%; height: 100%; } 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 }}
-
+
序号 @@ -29,16 +29,12 @@
{{ item.xh }} - {{ item.hd }} + {{ item.hd }} {{ item.dqsw }} {{ item.kzsw }} 正常 - 超控制常水位 @@ -46,39 +42,28 @@
-
河湖简介:延河
+
河湖简介:{{ HhName }}
- 延河为黄河右岸一级支流,发源于陕西省靖边县天赐湾乡周山南麓,经安塞县镰刀湾乡杨石寺村附近进人延安境内,自西北流向东南,经安塞、宝塔、延长等县(区),于延长南河沟乡凉水岸汇人黄河。延河全长286.9km,流城面积7725 - km?,平均比降3.3%。市内河长248.5 km,市内面积7321 - km?,主要支流有杏子河、坪桥川、西川河、南川河、蟠龙川等。 + {{ hdJj }}
    -
  • +
  • 站点名称:
    {{ i.siteName }}
    - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
    深:
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析:
    @@ -94,28 +79,19 @@
      -
    • +
    • 站点名称:
      {{ i.siteName }}
      - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
      深:
      -
      - {{ i.z || 0 }}米 -
      +
      {{ i.z || 0 }}米
      风险分析:
      @@ -144,29 +120,16 @@ 状态 操作
      - +
      {{ item.wranLocation }} {{ item.riskProfile }} {{ item.assessment }} - 派单 - 已派单 + 已派单
      @@ -203,10 +166,7 @@
- +
@@ -228,8 +188,8 @@ const FXJCData = ref([ { - xh: "1", - hd: "延河", + xh: '1', + hd: '延河', dqsw: 130, kzsw: 2000, zt: "超控制常水位", @@ -237,8 +197,8 @@ position:[109.497341,36.603151], }, { - xh: "2", - hd: "杜甫川河", + xh: '2', + hd: '杜甫川河', dqsw: 10, kzsw: 300, zt: "正常", @@ -246,8 +206,8 @@ position:[109.417646,36.571427], }, { - xh: "3", - hd: "西川河", + xh: '3', + hd: '西川河', dqsw: 11, kzsw: 700, zt: "正常", @@ -255,8 +215,8 @@ position:[109.383491,36.634602], }, { - xh: "4", - hd: "南川河", + xh: '4', + hd: '南川河', dqsw: 12, kzsw: 700, zt: "正常", @@ -322,43 +282,46 @@ // }, ]); const yearList = ref([ - { name: "月", value: 1 }, - { name: "年", value: 2 }, + { name: '月', value: 1 }, + { name: '年', value: 2 }, ]); const monitorData = ref([ - { name: "漫溢监测(1/29)", value: 1 }, - { name: "积水监测(0/16)", value: 2 }, - { name: "水位监测(0/4)", value: 2 }, + { name: '积水监测(0/16)', value: 2 }, + { name: '漫溢监测(1/29)', value: 1 }, + { name: '流量监测(0/4)', value: 2 }, ]); const chartData2 = ref({ - xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"], + xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'], refresh: 1, }); -const activedname = ref("月"); -const monitorname = ref("漫溢监测(1/29)"); +const HhName = ref('延河'); +const hdJj = ref( + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。' +); +const activedname = ref('月'); +const monitorname = ref('漫溢监测(1/29)'); function yearclick(val) { activedname.value = val.name; } - function monitorclick(val) { monitorname.value = val.name; - if (monitorname.value == "漫溢监测(1/29)") { + if (monitorname.value == '漫溢监测(1/29)') { listData.value = [ { - siteName: "东关大街与长青路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101612", + siteName: '东关大街与长青路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101612', }, { - siteName: "大桥街与延河西路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101613", + siteName: '大桥街与延河西路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101613', }, { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; - } else if (monitorname.value == "积水监测(0/16)") { + } else if (monitorname.value == '积水监测(0/16)') { listData.value = jsjcData.value; // listData.value = [ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险' }, @@ -366,12 +329,12 @@ // // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, // ]; } else { - console.log(monitorname.value, " monitorname.value"); + console.log(monitorname.value, ' monitorname.value'); } } // 弹框 function showMapDalog(val) { - console.log("val.siteName", val); + console.log('val.siteName', val); useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { @@ -381,15 +344,15 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 积水弹框 function JSshowMapDalog(val) { - console.log("🚀 ~ JSshowMapDalog ~ val:", val); + console.log('🚀 ~ JSshowMapDalog ~ val:', val); // let data = { // title: val.siteName, // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 @@ -404,50 +367,50 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { // console.log('🚀 ~ getTabsList ~ res:', res); data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 派单 -const paidan = (item) => { +const paidan = item => { let data = { title: item.wranLocation, - comIDs: ["gdpf"], + comIDs: ['gdpf'], getSiteId: item.id, }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }; // 超控制常水位 function showcswDalog(val) { - console.log(val, "val"); + console.log(val, 'val'); let data = { - title: val.hd + "监测点", - comIDs: ["PS_ckzcsw"], + title: val.hd + '监测点', + comIDs: ['PS_ckzcsw'], }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); // showPipe.value = true; } // 获取实时预警列表 const getRealTimeWarning = async () => { try { - const res = await commonWarningList({ moduleType: "drainage" }); + const res = await commonWarningList({ moduleType: 'drainage' }); SSYJData.value = res.data; // console.log('🚀 ~ getCommonWarningList ~ res:', res); } catch (error) { - console.log("🚀 ~ getCommonWarningList ~ error:", error); + console.log('🚀 ~ getCommonWarningList ~ error:', error); } }; // 获取站点弹窗 tab列表 -const getTabsList = async (siteNo) => { +const getTabsList = async siteNo => { try { const res = await selectBoxBySiteNo(siteNo); - const tabsList = res.data.boxList.map((item) => item.boxId); + const tabsList = res.data.boxList.map(item => item.boxId); return tabsList; } catch (error) { console.log(" ~ getTabsList ~ error:", error); @@ -458,22 +421,40 @@ const getWaterlogging = async () => { try { const res = await selectSiteMonitorBySiteType({ - monitorTargetType: "waterlogging", - orderBy: "online_status asc", - siteType: "water_level", + monitorTargetType: 'waterlogging', + orderBy: 'online_status asc', + siteType: 'water_level', }); jsjcData.value = res.data; // console.log('🚀 ~ getWaterlogging ~ res:', res); } catch (error) { - console.log("🚀 ~ getWaterlogging ~ error:", error); + console.log('🚀 ~ getWaterlogging ~ error:', error); } }; // 展示四色图 -const ShowSiSetu = (bol) => { - bus.emit("SetLayerShow", ["排水风险评估"]); +const ShowSiSetu = bol => { + bus.emit('SetLayerShow', ['排水风险评估']); // bus.emit("SiSeTuBol", true); }; +// 河道点击 +const WzTrigger = val => { + HhName.value = val; + if (val == '延河') { + hdJj.value = + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。'; + } else if (val == '杜甫川河') { + hdJj.value = + '杜甫川河发源于延安市佛道坪,自西向东流经万花,在延安市马家湾汇入南川河,为南川河的一级支流,河长21km,流域面积166km2,河道平均比降9.3‰,多年平均径流量0.04 亿m 3,最大流量100m3 /s,流量最小时河道断流,河谷狭窄,宽度200~300m,最宽约400m。阶地零星分布,阶面倾向河床,川地高程一般在975~1000m。左岸岸坡低缓,坡高在75m 左右,坡度小于40°;右岸斜坡坡高 50~100m,坡度30°~50°,多为黄土斜坡。'; + } else if (val == '西川河') { + hdJj.value = + '西川河为延河一级支流,发源于安塞区李盆窑子,自西向东流经安塞县的砖窑湾镇高桥乡,在延安市枣园以东、延安兰家坪桥下游汇入延河。西川河流域面积801.1km2,河长61.5km,河道平均比降5.7‰, 多年平均径流量0.29亿m3,最大流量440m3/s,最小流量 0.001m3/s。西川河下游设有枣园水文站,距河口 13km,枣园水文站以上控制流量面积719km2。西川河河谷在横剖面上呈宽阔的“U”型,宽度一般为400~500m,最大宽度700m;川地高950~965m,河床稍向下游倾斜,受水流影响,河床两岸阶地呈不对称,凸岸阶地发育,阶面微向河床倾斜,凹岸很少有阶地。'; + } else { + hdJj.value = + '南川河发源于延安市元庄,自南向北流径柳林镇,在宝塔山下附近入延河,属延河一级支流,河长24.2km,流域面积432.5km2,河道平均比降9.6‰,多年平均径流量0.15亿m 3,最大流量650m3 /s,流量最小时南川河断流。南川河河谷相对较窄,宽度为450m 左右,川地高程960~990m,阶地不甚发育,河床向两侧以缓坡形式过度到两岸斜坡;宝塔山至七里铺段,河谷两岸斜坡高度多在50~100m,坡度普遍大于40°,部分达70°;由于河流14下切,基岩出露,在左右岸坡脚处分别形成 10~20m 和 10~30m的基岩陡坎,坡角普遍大于 80°。在七里铺至柳林河段,岸坡明显减缓,坡度多小于40°,坡高在50m以上。'; + } +}; + onMounted(() => { // 获取预警列表 getRealTimeWarning(); @@ -507,7 +488,7 @@ width: 132px; height: 30px; padding: 2px 3px; - background: url("@/assets/images/zhps/fxpgw.png") no-repeat; + background: url('@/assets/images/zhps/fxpgw.png') no-repeat; background-size: 100% 100%; text-align: center; margin-top: 5px; @@ -516,7 +497,7 @@ .activedright { border: 1px solid #2cfce9; color: #e4f5ff; - background: url("@/assets/images/zhps/fxpgxz.png") no-repeat; + background: url('@/assets/images/zhps/fxpgxz.png') no-repeat; background-size: 100% 100%; } } @@ -688,6 +669,7 @@ line-height: 34px; text-align: center; width: 15%; + cursor: pointer; } .tableBodyList_span3 { font-family: Source Han Sans CN; @@ -922,7 +904,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 3581ddd..31ea2b6 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -5,20 +5,14 @@
延安市城市生命线安全运行监测系统
- + 延安
@@ -37,15 +31,9 @@
- + - + @@ -84,11 +72,7 @@ :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']" v-if="AllData.MapShowBol" /> - + - + - + - + - - + - + - + - +
@@ -160,11 +115,7 @@ @@ -63,40 +63,55 @@ import jgwyj_icon from '@/assets/tunnelImg/jgwyj_icon.png'; import tjy_icon from '@/assets/tunnelImg/tjy_icon.png'; import ybj_icon from '@/assets/tunnelImg/ybj_icon.png'; - +import jlszy_icon from '@/assets/qiaoliangImg/jlszy.png'; const introduce = '延安市杨家岭隧道位于延安市中心城区西北部,走向大致由南向北。项目起点位于延安市拟建的延师桥北桥头、并与现有的延安市枣园路相交,路线向北穿杨家岭隧道至杨家岭沟内、与拟建的延安市杨家岭道路相交。路线全长0.911公里、其中隧道775米。'; -const videoList = [jk_01, jk_02, jk_03, jk_04]; +const videoList = [ + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji1.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji2.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji3.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji4.mp4', + }, +]; const shebeiList = [ { name: ['激光位移计'], icon: jgwyj_icon, - num: 27, + num: '2/27', }, + + { + name: ['静力水准仪'], + icon: jlszy_icon, + num: '2/2', + }, + { name: ['光纤光栅', '应变计'], icon: ybj_icon, - num: 45, + num: '1/45', }, { name: ['光纤光栅', '调节仪'], icon: tjy_icon, - num: 5, + num: '0/5', }, { name: ['光纤光栅', '裂缝计'], icon: lfj_icon, - num: 27, + num: '1/27', }, { name: ['智能球形', '摄像机'], icon: sxj_icon, - num: 4, - }, - { - name: ['其他'], - icon: qt_icon, - num: 0, + num: '0/4', }, ]; @@ -236,7 +251,7 @@ // border: 1px solid red; width: 206px; height: 104px; - img { + #videoEvent { width: 100%; height: 100%; } diff --git a/src/views/voice/recordPage/index.vue b/src/views/voice/recordPage/index.vue index 510b218..66b23cf 100644 --- a/src/views/voice/recordPage/index.vue +++ b/src/views/voice/recordPage/index.vue @@ -76,7 +76,7 @@ ); var recorder = new Recorder({ sampleBits: 16, // 采样位数,支持 8 或 16,默认是16 - sampleRate: 48000, // 采样率,支持 11025、16000、22050、24000、44100、48000,根据浏览器默认值,我的chrome是48000 + sampleRate: 11025, // 采样率,支持 11025、16000、22050、24000、44100、48000,根据浏览器默认值,我的chrome是48000 numChannels: 1, // 声道,支持 1 或 2, 默认是1 // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换,默认是false }); @@ -372,17 +372,18 @@ Recorder.getPermission().then( () => { // proxy.$modal.msgSuccess("获取权限成功,开始录音"); - nowword.value = "开始录音"; - recorder.start(); - console.log(`开始录音`, parseTime(new Date())); - //三秒钟后语音识别结束,并进入到下一步骤 - setTimeout(() => { - process.value = 2; - if (process.value == 2) { - // 如果手动提前点击了结束进度到下一步,那么这就可以不用走了 - stopRecorderAndupload("stop"); //这里面返回结果进行监听,做了处理process.value=3,且回调Record() - } - }, 3000); + recorder.start().then(() => { + nowword.value = "开始录音"; + console.log(`开始录音`, parseTime(new Date())); + //三秒钟后语音识别结束,并进入到下一步骤 + setTimeout(() => { + process.value = 2; + if (process.value == 2) { + // 如果手动提前点击了结束进度到下一步,那么这就可以不用走了 + stopRecorderAndupload("stop"); //这里面返回结果进行监听,做了处理process.value=3,且回调Record() + } + }, 5000); + }); }, (error) => { proxy.$modal.msgError("请先允许该网页使用麦克风"); @@ -393,7 +394,7 @@ // 将获取到的音频文件上传到服务器[通过webSocket方式] function uploadaudioformwebSocket() { const mp3Blob = convertToMp3(recorder.getWAV()); - // recorder.download(mp3Blob, 'recorder', 'mp3'); + recorder.download(mp3Blob, "recorder", "mp3"); mp3ToBase64(mp3Blob).then((stream) => { // console.log('语音打印', stream) // 下面发送数据 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 }}
-
+
序号 @@ -29,16 +29,12 @@
{{ item.xh }} - {{ item.hd }} + {{ item.hd }} {{ item.dqsw }} {{ item.kzsw }} 正常 - 超控制常水位 @@ -46,39 +42,28 @@
-
河湖简介:延河
+
河湖简介:{{ HhName }}
- 延河为黄河右岸一级支流,发源于陕西省靖边县天赐湾乡周山南麓,经安塞县镰刀湾乡杨石寺村附近进人延安境内,自西北流向东南,经安塞、宝塔、延长等县(区),于延长南河沟乡凉水岸汇人黄河。延河全长286.9km,流城面积7725 - km?,平均比降3.3%。市内河长248.5 km,市内面积7321 - km?,主要支流有杏子河、坪桥川、西川河、南川河、蟠龙川等。 + {{ hdJj }}
    -
  • +
  • 站点名称:
    {{ i.siteName }}
    - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
    深:
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析:
    @@ -94,28 +79,19 @@
      -
    • +
    • 站点名称:
      {{ i.siteName }}
      - {{ i.onlineStatus == "online" ? "在线" : "离线" }} + {{ + i.onlineStatus == 'online' ? '在线' : '离线' + }}
      深:
      -
      - {{ i.z || 0 }}米 -
      +
      {{ i.z || 0 }}米
      风险分析:
      @@ -144,29 +120,16 @@ 状态 操作
      - +
      {{ item.wranLocation }} {{ item.riskProfile }} {{ item.assessment }} - 派单 - 已派单 + 已派单
      @@ -203,10 +166,7 @@
- +
@@ -228,8 +188,8 @@ const FXJCData = ref([ { - xh: "1", - hd: "延河", + xh: '1', + hd: '延河', dqsw: 130, kzsw: 2000, zt: "超控制常水位", @@ -237,8 +197,8 @@ position:[109.497341,36.603151], }, { - xh: "2", - hd: "杜甫川河", + xh: '2', + hd: '杜甫川河', dqsw: 10, kzsw: 300, zt: "正常", @@ -246,8 +206,8 @@ position:[109.417646,36.571427], }, { - xh: "3", - hd: "西川河", + xh: '3', + hd: '西川河', dqsw: 11, kzsw: 700, zt: "正常", @@ -255,8 +215,8 @@ position:[109.383491,36.634602], }, { - xh: "4", - hd: "南川河", + xh: '4', + hd: '南川河', dqsw: 12, kzsw: 700, zt: "正常", @@ -322,43 +282,46 @@ // }, ]); const yearList = ref([ - { name: "月", value: 1 }, - { name: "年", value: 2 }, + { name: '月', value: 1 }, + { name: '年', value: 2 }, ]); const monitorData = ref([ - { name: "漫溢监测(1/29)", value: 1 }, - { name: "积水监测(0/16)", value: 2 }, - { name: "水位监测(0/4)", value: 2 }, + { name: '积水监测(0/16)', value: 2 }, + { name: '漫溢监测(1/29)', value: 1 }, + { name: '流量监测(0/4)', value: 2 }, ]); const chartData2 = ref({ - xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"], + xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'], refresh: 1, }); -const activedname = ref("月"); -const monitorname = ref("漫溢监测(1/29)"); +const HhName = ref('延河'); +const hdJj = ref( + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。' +); +const activedname = ref('月'); +const monitorname = ref('漫溢监测(1/29)'); function yearclick(val) { activedname.value = val.name; } - function monitorclick(val) { monitorname.value = val.name; - if (monitorname.value == "漫溢监测(1/29)") { + if (monitorname.value == '漫溢监测(1/29)') { listData.value = [ { - siteName: "东关大街与长青路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101612", + siteName: '东关大街与长青路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101612', }, { - siteName: "大桥街与延河西路交叉口", - onlineStatus: "online", - riskAnalysis: "无风险", - siteNo: "2024101613", + siteName: '大桥街与延河西路交叉口', + onlineStatus: 'online', + riskAnalysis: '无风险', + siteNo: '2024101613', }, { siteName: '文化沟路与延河西路交叉口', siteStatus: 'online', warnInfo: '无风险',siteNo: '2024101634' }, ]; - } else if (monitorname.value == "积水监测(0/16)") { + } else if (monitorname.value == '积水监测(0/16)') { listData.value = jsjcData.value; // listData.value = [ // { siteName: '东关大街与长青路交叉口', siteStatus: '在线', warnInfo: '无风险' }, @@ -366,12 +329,12 @@ // // { siteName: '文化沟路与延河西路交叉口', siteStatus: '在线', warnInfo: '无风险' }, // ]; } else { - console.log(monitorname.value, " monitorname.value"); + console.log(monitorname.value, ' monitorname.value'); } } // 弹框 function showMapDalog(val) { - console.log("val.siteName", val); + console.log('val.siteName', val); useDialogTabs.addPosition(val.position.split(',').map(item => parseFloat(item))) let data = { @@ -381,15 +344,15 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 积水弹框 function JSshowMapDalog(val) { - console.log("🚀 ~ JSshowMapDalog ~ val:", val); + console.log('🚀 ~ JSshowMapDalog ~ val:', val); // let data = { // title: val.siteName, // comIDs: ['spjk', 'jcsj', 'danganInfo'], //积水监测 @@ -404,50 +367,50 @@ SiteNo: val.siteNo, }; - getTabsList(val.siteNo).then((res) => { + getTabsList(val.siteNo).then(res => { // console.log('🚀 ~ getTabsList ~ res:', res); data.comIDs = res; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }); // showPipe.value = true; } // 派单 -const paidan = (item) => { +const paidan = item => { let data = { title: item.wranLocation, - comIDs: ["gdpf"], + comIDs: ['gdpf'], getSiteId: item.id, }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); }; // 超控制常水位 function showcswDalog(val) { - console.log(val, "val"); + console.log(val, 'val'); let data = { - title: val.hd + "监测点", - comIDs: ["PS_ckzcsw"], + title: val.hd + '监测点', + comIDs: ['PS_ckzcsw'], }; - bus.emit("publicDialog", data); + bus.emit('publicDialog', data); // showPipe.value = true; } // 获取实时预警列表 const getRealTimeWarning = async () => { try { - const res = await commonWarningList({ moduleType: "drainage" }); + const res = await commonWarningList({ moduleType: 'drainage' }); SSYJData.value = res.data; // console.log('🚀 ~ getCommonWarningList ~ res:', res); } catch (error) { - console.log("🚀 ~ getCommonWarningList ~ error:", error); + console.log('🚀 ~ getCommonWarningList ~ error:', error); } }; // 获取站点弹窗 tab列表 -const getTabsList = async (siteNo) => { +const getTabsList = async siteNo => { try { const res = await selectBoxBySiteNo(siteNo); - const tabsList = res.data.boxList.map((item) => item.boxId); + const tabsList = res.data.boxList.map(item => item.boxId); return tabsList; } catch (error) { console.log(" ~ getTabsList ~ error:", error); @@ -458,22 +421,40 @@ const getWaterlogging = async () => { try { const res = await selectSiteMonitorBySiteType({ - monitorTargetType: "waterlogging", - orderBy: "online_status asc", - siteType: "water_level", + monitorTargetType: 'waterlogging', + orderBy: 'online_status asc', + siteType: 'water_level', }); jsjcData.value = res.data; // console.log('🚀 ~ getWaterlogging ~ res:', res); } catch (error) { - console.log("🚀 ~ getWaterlogging ~ error:", error); + console.log('🚀 ~ getWaterlogging ~ error:', error); } }; // 展示四色图 -const ShowSiSetu = (bol) => { - bus.emit("SetLayerShow", ["排水风险评估"]); +const ShowSiSetu = bol => { + bus.emit('SetLayerShow', ['排水风险评估']); // bus.emit("SiSeTuBol", true); }; +// 河道点击 +const WzTrigger = val => { + HhName.value = val; + if (val == '延河') { + hdJj.value = + '延河属黄河一级支流,发源于陕西省靖边县东南山区的天赐湾乡高峁山,流向东南经安塞、延安市区、延长县于南河沟乡凉水岸汇入黄河,全长286.9km,流域面积7725km2。以安塞化子坪、延安市的甘谷驿为界,可将延河分为上、中、下游河段,上游河谷狭窄,多呈“V”型,宽度10~80m,中游平均宽度600m,甘谷驿以下河段一般在1500m左右。'; + } else if (val == '杜甫川河') { + hdJj.value = + '杜甫川河发源于延安市佛道坪,自西向东流经万花,在延安市马家湾汇入南川河,为南川河的一级支流,河长21km,流域面积166km2,河道平均比降9.3‰,多年平均径流量0.04 亿m 3,最大流量100m3 /s,流量最小时河道断流,河谷狭窄,宽度200~300m,最宽约400m。阶地零星分布,阶面倾向河床,川地高程一般在975~1000m。左岸岸坡低缓,坡高在75m 左右,坡度小于40°;右岸斜坡坡高 50~100m,坡度30°~50°,多为黄土斜坡。'; + } else if (val == '西川河') { + hdJj.value = + '西川河为延河一级支流,发源于安塞区李盆窑子,自西向东流经安塞县的砖窑湾镇高桥乡,在延安市枣园以东、延安兰家坪桥下游汇入延河。西川河流域面积801.1km2,河长61.5km,河道平均比降5.7‰, 多年平均径流量0.29亿m3,最大流量440m3/s,最小流量 0.001m3/s。西川河下游设有枣园水文站,距河口 13km,枣园水文站以上控制流量面积719km2。西川河河谷在横剖面上呈宽阔的“U”型,宽度一般为400~500m,最大宽度700m;川地高950~965m,河床稍向下游倾斜,受水流影响,河床两岸阶地呈不对称,凸岸阶地发育,阶面微向河床倾斜,凹岸很少有阶地。'; + } else { + hdJj.value = + '南川河发源于延安市元庄,自南向北流径柳林镇,在宝塔山下附近入延河,属延河一级支流,河长24.2km,流域面积432.5km2,河道平均比降9.6‰,多年平均径流量0.15亿m 3,最大流量650m3 /s,流量最小时南川河断流。南川河河谷相对较窄,宽度为450m 左右,川地高程960~990m,阶地不甚发育,河床向两侧以缓坡形式过度到两岸斜坡;宝塔山至七里铺段,河谷两岸斜坡高度多在50~100m,坡度普遍大于40°,部分达70°;由于河流14下切,基岩出露,在左右岸坡脚处分别形成 10~20m 和 10~30m的基岩陡坎,坡角普遍大于 80°。在七里铺至柳林河段,岸坡明显减缓,坡度多小于40°,坡高在50m以上。'; + } +}; + onMounted(() => { // 获取预警列表 getRealTimeWarning(); @@ -507,7 +488,7 @@ width: 132px; height: 30px; padding: 2px 3px; - background: url("@/assets/images/zhps/fxpgw.png") no-repeat; + background: url('@/assets/images/zhps/fxpgw.png') no-repeat; background-size: 100% 100%; text-align: center; margin-top: 5px; @@ -516,7 +497,7 @@ .activedright { border: 1px solid #2cfce9; color: #e4f5ff; - background: url("@/assets/images/zhps/fxpgxz.png") no-repeat; + background: url('@/assets/images/zhps/fxpgxz.png') no-repeat; background-size: 100% 100%; } } @@ -688,6 +669,7 @@ line-height: 34px; text-align: center; width: 15%; + cursor: pointer; } .tableBodyList_span3 { font-family: Source Han Sans CN; @@ -922,7 +904,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 3581ddd..31ea2b6 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -5,20 +5,14 @@
延安市城市生命线安全运行监测系统
- + 延安
@@ -37,15 +31,9 @@
- + - + @@ -84,11 +72,7 @@ :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']" v-if="AllData.MapShowBol" /> - + - + - + - + - - + - + - + - +
@@ -160,11 +115,7 @@ @@ -63,40 +63,55 @@ import jgwyj_icon from '@/assets/tunnelImg/jgwyj_icon.png'; import tjy_icon from '@/assets/tunnelImg/tjy_icon.png'; import ybj_icon from '@/assets/tunnelImg/ybj_icon.png'; - +import jlszy_icon from '@/assets/qiaoliangImg/jlszy.png'; const introduce = '延安市杨家岭隧道位于延安市中心城区西北部,走向大致由南向北。项目起点位于延安市拟建的延师桥北桥头、并与现有的延安市枣园路相交,路线向北穿杨家岭隧道至杨家岭沟内、与拟建的延安市杨家岭道路相交。路线全长0.911公里、其中隧道775米。'; -const videoList = [jk_01, jk_02, jk_03, jk_04]; +const videoList = [ + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji1.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji2.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji3.mp4', + }, + { + url: 'https://server2.wh-nf.cn:8870/file/yanan_splx/suidao/shouji4.mp4', + }, +]; const shebeiList = [ { name: ['激光位移计'], icon: jgwyj_icon, - num: 27, + num: '2/27', }, + + { + name: ['静力水准仪'], + icon: jlszy_icon, + num: '2/2', + }, + { name: ['光纤光栅', '应变计'], icon: ybj_icon, - num: 45, + num: '1/45', }, { name: ['光纤光栅', '调节仪'], icon: tjy_icon, - num: 5, + num: '0/5', }, { name: ['光纤光栅', '裂缝计'], icon: lfj_icon, - num: 27, + num: '1/27', }, { name: ['智能球形', '摄像机'], icon: sxj_icon, - num: 4, - }, - { - name: ['其他'], - icon: qt_icon, - num: 0, + num: '0/4', }, ]; @@ -236,7 +251,7 @@ // border: 1px solid red; width: 206px; height: 104px; - img { + #videoEvent { width: 100%; height: 100%; } diff --git a/src/views/voice/recordPage/index.vue b/src/views/voice/recordPage/index.vue index 510b218..66b23cf 100644 --- a/src/views/voice/recordPage/index.vue +++ b/src/views/voice/recordPage/index.vue @@ -76,7 +76,7 @@ ); var recorder = new Recorder({ sampleBits: 16, // 采样位数,支持 8 或 16,默认是16 - sampleRate: 48000, // 采样率,支持 11025、16000、22050、24000、44100、48000,根据浏览器默认值,我的chrome是48000 + sampleRate: 11025, // 采样率,支持 11025、16000、22050、24000、44100、48000,根据浏览器默认值,我的chrome是48000 numChannels: 1, // 声道,支持 1 或 2, 默认是1 // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换,默认是false }); @@ -372,17 +372,18 @@ Recorder.getPermission().then( () => { // proxy.$modal.msgSuccess("获取权限成功,开始录音"); - nowword.value = "开始录音"; - recorder.start(); - console.log(`开始录音`, parseTime(new Date())); - //三秒钟后语音识别结束,并进入到下一步骤 - setTimeout(() => { - process.value = 2; - if (process.value == 2) { - // 如果手动提前点击了结束进度到下一步,那么这就可以不用走了 - stopRecorderAndupload("stop"); //这里面返回结果进行监听,做了处理process.value=3,且回调Record() - } - }, 3000); + recorder.start().then(() => { + nowword.value = "开始录音"; + console.log(`开始录音`, parseTime(new Date())); + //三秒钟后语音识别结束,并进入到下一步骤 + setTimeout(() => { + process.value = 2; + if (process.value == 2) { + // 如果手动提前点击了结束进度到下一步,那么这就可以不用走了 + stopRecorderAndupload("stop"); //这里面返回结果进行监听,做了处理process.value=3,且回调Record() + } + }, 5000); + }); }, (error) => { proxy.$modal.msgError("请先允许该网页使用麦克风"); @@ -393,7 +394,7 @@ // 将获取到的音频文件上传到服务器[通过webSocket方式] function uploadaudioformwebSocket() { const mp3Blob = convertToMp3(recorder.getWAV()); - // recorder.download(mp3Blob, 'recorder', 'mp3'); + recorder.download(mp3Blob, "recorder", "mp3"); mp3ToBase64(mp3Blob).then((stream) => { // console.log('语音打印', stream) // 下面发送数据 diff --git a/vite.config.js b/vite.config.js index cfc3f34..a500b18 100644 --- a/vite.config.js +++ b/vite.config.js @@ -89,7 +89,7 @@ }, //百度全景 '/bdApi': { - //target: 'http://192.168.16.34:8105/', //测试服务 + // target: 'http://192.168.16.34:8105/', //测试服务 target: 'https://server2.wh-nf.cn:8088/prod-api/bdApi/', //测试服务 changeOrigin: true, logLevel: 'debug',