فهرست منبع

Merge branch '165' of uskycloud/usky-web-mobile into master

王涛 1 سال پیش
والد
کامیت
21d90c8a4f
1فایلهای تغییر یافته به همراه104 افزوده شده و 66 حذف شده
  1. 104 66
      src/static/amap/coordination.html

+ 104 - 66
src/static/amap/coordination.html

@@ -56,20 +56,29 @@
 
     <script type="text/javascript">
         var checkedArray = {
-            checkedData: 1,
-            checkedList: [
-                { value: 1, label: "消防站" },
-                { value: 2, label: "消防车" },
-                { value: 3, label: "监控" },
-                { value: 4, label: "重点单位" },
-                { value: 5, label: "消火栓/天然水源" },
-            ],
-        }//类型筛选
-
-        $.each(checkedArray.checkedList, function (i, item) {
+                checkedData: 1,
+                checkedList: [{
+                    value: 1,
+                    label: "消防站"
+                }, {
+                    value: 2,
+                    label: "消防车"
+                }, {
+                    value: 3,
+                    label: "监控"
+                }, {
+                    value: 4,
+                    label: "重点单位"
+                }, {
+                    value: 5,
+                    label: "消火栓/天然水源"
+                }, ],
+            } //类型筛选
+
+        $.each(checkedArray.checkedList, function(i, item) {
             $("#selectId").append(`<option value="${item.value}">${item.label}</option>`)
         })
-        $(function () {
+        $(function() {
             $(".select02").M_select({
                 // 手动添加下拉款图片(以html页面为起始位置写路径)
                 "Img": "./js/M_select/up4.png",
@@ -79,7 +88,7 @@
                 "inputName": "selected_value",
                 // 默认选中的值(参数值写需要选中的select的value值)
                 "selected": "1",
-                Succee: function () {
+                Succee: function() {
                     checkedArray.checkedData = parseInt($(".inputHidden").val())
                     mapCluster();
                 }
@@ -87,7 +96,7 @@
         });
 
         //点击遮罩层关闭
-        $('#notification .mask').on('click', function (e) {
+        $('#notification .mask').on('click', function(e) {
             $('#notification').css('display', 'none')
 
             $('#notification .content #xxxx').remove()
@@ -95,7 +104,6 @@
     </script>
 
     <script type="text/javascript">
-
         var cluster, markers = [];
         var map = [];
         var mapPolList = [];
@@ -120,26 +128,53 @@
         var polygon1 = null //选中地图区域数据存储
         var textList = [] //地图文字数据存储
 
-        var streetTown = ""//街镇信息存储
-        var streetTownList = [
-            { value: "", label: "全区" },
-            { value: "华漕镇", label: "华漕镇" },
-            { value: "虹桥镇", label: "虹桥镇" },
-            { value: "梅陇镇", label: "梅陇镇" },
-            { value: "七宝镇", label: "七宝镇" },
-            { value: "颛桥镇", label: "颛桥镇" },
-            { value: "马桥镇", label: "马桥镇" },
-            { value: "吴泾镇", label: "吴泾镇" },
-            { value: "浦江镇", label: "浦江镇" },
-            { value: "新虹街道", label: "新虹街道" },
-            { value: "古美路街道", label: "古美路街道" },
-            { value: "江川路街道", label: "江川路街道" },
-            { value: "浦锦街道", label: "浦锦街道" },
-            { value: "莘庄镇", label: "莘庄镇" },
-        ]
-
-        var tankuangXY = {}//撒点弹框坐标
-        var arrayList = {}//撒点弹框数据存储
+        var streetTown = "" //街镇信息存储
+        var streetTownList = [{
+            value: "",
+            label: "全区"
+        }, {
+            value: "华漕镇",
+            label: "华漕镇"
+        }, {
+            value: "虹桥镇",
+            label: "虹桥镇"
+        }, {
+            value: "梅陇镇",
+            label: "梅陇镇"
+        }, {
+            value: "七宝镇",
+            label: "七宝镇"
+        }, {
+            value: "颛桥镇",
+            label: "颛桥镇"
+        }, {
+            value: "马桥镇",
+            label: "马桥镇"
+        }, {
+            value: "吴泾镇",
+            label: "吴泾镇"
+        }, {
+            value: "浦江镇",
+            label: "浦江镇"
+        }, {
+            value: "新虹街道",
+            label: "新虹街道"
+        }, {
+            value: "古美路街道",
+            label: "古美路街道"
+        }, {
+            value: "江川路街道",
+            label: "江川路街道"
+        }, {
+            value: "浦锦街道",
+            label: "浦锦街道"
+        }, {
+            value: "莘庄镇",
+            label: "莘庄镇"
+        }, ]
+
+        var tankuangXY = {} //撒点弹框坐标
+        var arrayList = {} //撒点弹框数据存储
 
 
         function initMap() {
@@ -286,7 +321,7 @@
 
             map.setFitView();
 
-            var logMapinfo = function () {
+            var logMapinfo = function() {
                 var zoom = map.getZoom(); //获取当前地图级别
 
                 var dom = document.getElementsByClassName("amap-overlay-text-container");
@@ -320,7 +355,10 @@
 
             if (pageType === "警情综合处置") {
                 data.forEach((val) => {
-                    points.push({ lnglat: [val.longitude, val.latitude], array: val });
+                    points.push({
+                        lnglat: [val.longitude, val.latitude],
+                        array: val
+                    });
                 });
 
                 if (type) {
@@ -348,7 +386,7 @@
                 }
             }
 
-            var _renderMarker = function (context) {
+            var _renderMarker = function(context) {
                 var content = `<div style="${style}"></div>`;
                 var offset = new AMap.Pixel(-9, -9);
                 context.marker.setContent(content);
@@ -356,7 +394,10 @@
 
                 // 给每个点坐标绑定鼠标经过事件,这里是实现点击功能的重点
                 context.marker.on("mouseover", (e) => {
-                    tankuangXY = { x: e.pixel.x, y: e.pixel.y };
+                    tankuangXY = {
+                        x: e.pixel.x,
+                        y: e.pixel.y
+                    };
 
                     if (pageType === "警情综合处置") {
                         if (type !== 6) {
@@ -428,10 +469,10 @@
             }
             if (tag == 2) {
                 //完全自定义
-                this.map.plugin(["AMap.MarkerClusterer"], function () {
+                this.map.plugin(["AMap.MarkerClusterer"], function() {
                     cluster = new AMap.MarkerCluster(map, points, {
                         gridSize: 80, // 设置网格像素大小
-                        renderClusterMarker: function (context) {
+                        renderClusterMarker: function(context) {
                             var factor = Math.pow(context.count / points.length, 1 / 18);
                             var div = document.createElement("div");
                             var Hue = 180 - factor * 180;
@@ -462,30 +503,25 @@
                     url: "https://a.amap.com/jsapi_demos/static/images/blue.png",
                     size: new AMap.Size(32, 32),
                     offset: new AMap.Pixel(-16, -16),
-                },
-                {
+                }, {
                     url: "https://a.amap.com/jsapi_demos/static/images/green.png",
                     size: new AMap.Size(32, 32),
                     offset: new AMap.Pixel(-16, -16),
-                },
-                {
+                }, {
                     url: "https://a.amap.com/jsapi_demos/static/images/orange.png",
                     size: new AMap.Size(36, 36),
                     offset: new AMap.Pixel(-18, -18),
-                },
-                {
+                }, {
                     url: "https://a.amap.com/jsapi_demos/static/images/red.png",
                     size: new AMap.Size(48, 48),
                     offset: new AMap.Pixel(-24, -24),
-                },
-                {
+                }, {
                     url: "https://a.amap.com/jsapi_demos/static/images/darkRed.png",
                     size: new AMap.Size(48, 48),
                     offset: new AMap.Pixel(-24, -24),
-                },
-                ];
+                }, ];
 
-                map.plugin(["AMap.MarkerCluster"], function () {
+                map.plugin(["AMap.MarkerCluster"], function() {
                     cluster = new AMap.MarkerCluster(map, points, {
                         styles: sts,
                         gridSize: 80,
@@ -494,8 +530,10 @@
                 });
             } else {
                 //默认样式
-                map.plugin(["AMap.MarkerCluster"], function () {
-                    cluster = new AMap.MarkerCluster(map, points, { gridSize: 80 });
+                map.plugin(["AMap.MarkerCluster"], function() {
+                    cluster = new AMap.MarkerCluster(map, points, {
+                        gridSize: 80
+                    });
                 });
             }
         }
@@ -513,19 +551,19 @@
             });
 
 
-            $.get('http://mobile.usky.cn:8099/prod-api/service-fire/demPoliceInfo/synthesizePoliceSituationScatterer', {
-                streetTown: streetTown,
-                scattererType: label
-            }, function (res) {
-                console.log(res)
+            $.get('http://xf.usky.cn:13203/prod-api/service-fire/demPoliceInfo/synthesizePoliceSituationScatterer', {
+                    streetTown: streetTown,
+                    scattererType: label
+                }, function(res) {
+                    console.log(res)
 
-                if (res.data.length > 0) {
-                    initMarkers(res.data, "警情综合处置", checkedArray.checkedData);
-                } else {
-                    initMarkers([], "警情综合处置", checkedArray.checkedData);
-                }
-            })
-            // 
+                    if (res.data.length > 0) {
+                        initMarkers(res.data, "警情综合处置", checkedArray.checkedData);
+                    } else {
+                        initMarkers([], "警情综合处置", checkedArray.checkedData);
+                    }
+                })
+                // 
         }
 
         initMap();