九小场所撒点

src/components/mixins/map-data1.js

@@ -63,7 +63,7 @@ export default {
                     perPositionHeight: true,
                     height: 200,
                     width: "10px",
-                    size:"10px",
+                    size: "10px",
                     label: {
                         show: true,
                         text: "name",
@@ -107,58 +107,57 @@ export default {
         /**
          * 疏导区网格
          */
-        anbaoSDUWG(){
-            console.log(1111)
+        anbaoSDUWG() {
             let arr = [
                 [
-                    {x:121.36194587932806,y:31.16013705465239,z:0},
-                    {x:121.34727553811794,y:31.15828077299882,z:0},
-                    {x:121.32700411033827,y:31.148247489434965,z:0},
-                    {x:121.31514606604391,y:31.139440444833916,z:0},
-                    {x:121.30048786370499,y:31.134903156770502,z:0},
-                    {x:121.29284839062778,y:31.12773298212305,z:0},
-                    {x:121.28484794201171,y:31.12306873887283,z:0},
-                    {x:121.2434981967536,y:31.119911283997425,z:0},
-                    {x:121.22295978253271,y:31.11453182095247,z:0},
-                    {x:121.22093534994545,y:31.128184924119704,z:0},
-                    {x:121.22476714240756,y:31.137743873822444,z:0},
-                    {x:121.22284789103668,y:31.151848705517672,z:0},
-                    {x:121.2192245740552,y:31.185051824029983,z:0},
-                    {x:121.21634530262463,y:31.19305254070648,z:0},
-                    {x:121.21666410880577,y:31.199965150511076,z:0},
-                    {x:121.20802887999594,y:31.252419358825662,z:0},
-                    {x:121.2510308379889,y:31.25199056924825,z:0},
-                    {x:121.26975280768023,y:31.256161713215423,z:0},
-                    {x:121.29758483246128,y:31.25239812402721,z:0},
-                    {x:121.34774474510056,y:31.253635862387053,z:0},
-                    {x:121.34278143296902,y:31.239737181776324,z:0},
-                    {x:121.34412376809345,y:31.224709084528335,z:0},
-                    {x:121.35105449522602,y:31.20248989001769,z:0},
-                    {x:121.35374042236845,y:31.182090361752536,z:0},
-                    {x:121.36194587932806,y:31.16013705465239,z:0},
+                    { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
+                    { x: 121.34727553811794, y: 31.15828077299882, z: 0 },
+                    { x: 121.32700411033827, y: 31.148247489434965, z: 0 },
+                    { x: 121.31514606604391, y: 31.139440444833916, z: 0 },
+                    { x: 121.30048786370499, y: 31.134903156770502, z: 0 },
+                    { x: 121.29284839062778, y: 31.12773298212305, z: 0 },
+                    { x: 121.28484794201171, y: 31.12306873887283, z: 0 },
+                    { x: 121.2434981967536, y: 31.119911283997425, z: 0 },
+                    { x: 121.22295978253271, y: 31.11453182095247, z: 0 },
+                    { x: 121.22093534994545, y: 31.128184924119704, z: 0 },
+                    { x: 121.22476714240756, y: 31.137743873822444, z: 0 },
+                    { x: 121.22284789103668, y: 31.151848705517672, z: 0 },
+                    { x: 121.2192245740552, y: 31.185051824029983, z: 0 },
+                    { x: 121.21634530262463, y: 31.19305254070648, z: 0 },
+                    { x: 121.21666410880577, y: 31.199965150511076, z: 0 },
+                    { x: 121.20802887999594, y: 31.252419358825662, z: 0 },
+                    { x: 121.2510308379889, y: 31.25199056924825, z: 0 },
+                    { x: 121.26975280768023, y: 31.256161713215423, z: 0 },
+                    { x: 121.29758483246128, y: 31.25239812402721, z: 0 },
+                    { x: 121.34774474510056, y: 31.253635862387053, z: 0 },
+                    { x: 121.34278143296902, y: 31.239737181776324, z: 0 },
+                    { x: 121.34412376809345, y: 31.224709084528335, z: 0 },
+                    { x: 121.35105449522602, y: 31.20248989001769, z: 0 },
+                    { x: 121.35374042236845, y: 31.182090361752536, z: 0 },
+                    { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
                 ],
                 [
-                    {x:121.30025,y:31.184825,z:0},
-                    {x:121.298659,y:31.186719,z:0},
-                    {x:121.297278,y:31.188721,z:0},
-                    {x:121.294521,y:31.19274,z:0},
-                    {x:121.302864,y:31.196146,z:0},
-                    {x:121.304392,y:31.193755,z:0},
-                    {x:121.306291,y:31.191095,z:0},
-                    {x:121.308116,y:31.188478,z:0},
-                    {x:121.309198,y:31.186907,z:0},
-                    {x:121.309383,y:31.186432,z:0},
-                    {x:121.309391,y:31.185858,z:0},
-                    {x:121.309372,y:31.185243,z:0},
-                    {x:121.309175,y:31.185049,z:0},
-                    {x:121.308407,y:31.184564,z:0},
-                    {x:121.307629,y:31.18408,z:0},
-                    {x:121.306116,y:31.18316,z:0},
-                    {x:121.303064,y:31.181291,z:0},
-                    {x:121.30025,y:31.184825,z:0},
+                    { x: 121.30025, y: 31.184825, z: 0 },
+                    { x: 121.298659, y: 31.186719, z: 0 },
+                    { x: 121.297278, y: 31.188721, z: 0 },
+                    { x: 121.294521, y: 31.19274, z: 0 },
+                    { x: 121.302864, y: 31.196146, z: 0 },
+                    { x: 121.304392, y: 31.193755, z: 0 },
+                    { x: 121.306291, y: 31.191095, z: 0 },
+                    { x: 121.308116, y: 31.188478, z: 0 },
+                    { x: 121.309198, y: 31.186907, z: 0 },
+                    { x: 121.309383, y: 31.186432, z: 0 },
+                    { x: 121.309391, y: 31.185858, z: 0 },
+                    { x: 121.309372, y: 31.185243, z: 0 },
+                    { x: 121.309175, y: 31.185049, z: 0 },
+                    { x: 121.308407, y: 31.184564, z: 0 },
+                    { x: 121.307629, y: 31.18408, z: 0 },
+                    { x: 121.306116, y: 31.18316, z: 0 },
+                    { x: 121.303064, y: 31.181291, z: 0 },
+                    { x: 121.30025, y: 31.184825, z: 0 },
                 ]
             ]
-            for(let i=0;i<arr.length;i++){
+            for (let i = 0; i < arr.length; i++) {
                 console.log(i)
                 let target = {
                     id: i,
@@ -169,11 +168,11 @@ export default {
                     label: {
                         text: i,
                         font: "16px Helvetica",
-                        color: i ==0 ? "red" : "orange",
+                        color: i == 0 ? "red" : "orange",
                         pixelOffset: [0, -50],
                         backgroundColor: "red"
                     }
-    
+
                 }
                 let options = {
                     isZoom: false,
@@ -183,14 +182,14 @@ export default {
                         outline: true,
                         outlineColor: 'transparent',
                         perPositionHeight: true
-    
+
                     },
                     // click: regionLocateCallBack111
                 };
                 setTimeout(() => {
                     window.jMap.Locate.trackLocate(target, options);
-                }, 2000)
-                
+                }, 1000)
+
             }
         },
         /**
@@ -275,20 +274,18 @@ export default {
 
                         })
                         let arr = []
-                        for(let i=0;i<bigArr.length;i++){
+                        for (let i = 0; i < bigArr.length; i++) {
                             arr.push([])
-                            for(let ii =0;ii<bigArr[i].geometry.rings[0].length;ii++){
-                                arr[i].push(
-                                    {
-                                        x:bigArr[i].geometry.rings[0][ii][0],
-                                        y:bigArr[i].geometry.rings[0][ii][1],
-                                        z:0,
-                                    }
-                                )
+                            for (let ii = 0; ii < bigArr[i].geometry.rings[0].length; ii++) {
+                                arr[i].push({
+                                    x: bigArr[i].geometry.rings[0][ii][0],
+                                    y: bigArr[i].geometry.rings[0][ii][1],
+                                    z: 0,
+                                })
                             }
                         }
-                        console.log(11111,arr)
-                        for(let i=0;i<arr.length;i++){
+                        console.log(11111, arr)
+                        for (let i = 0; i < arr.length; i++) {
                             let target = {
                                 id: i + 1,
                                 attributes: {
@@ -302,7 +299,7 @@ export default {
                                     pixelOffset: [0, -50],
                                     backgroundColor: "red"
                                 }
-                
+
                             }
                             var options = {
                                 isZoom: false,
@@ -312,20 +309,21 @@ export default {
                                     outline: true,
                                     outlineColor: 'transparent',
                                     perPositionHeight: true
-                
+
                                 },
                                 click: regionLocateCallBack111
                             };
                             setTimeout(() => {
                                 window.jMap.Locate.trackLocate(target, options);
                             }, 1000)
-                            
+
                         }
+
                         function regionLocateCallBack111(obj) {
                             // console.log(obj);       // obj为返回值
                         }
-                    //画线---------------------------------- 
-                    //区域---------------------------------- 
+                        //画线---------------------------------- 
+                        //区域---------------------------------- 
                         var bigArr = obj.features.filter(function(el) {
                             return el.attributes.name.indexOf('新虹街道') > -1 ||
                                 el.attributes.name.indexOf('华漕') > -1 ||
@@ -353,54 +351,54 @@ export default {
                         bigNewArr.forEach(function(item, index) {
                             var idx = index + 1;
                             setTimeout(() => {
-                                    // 2区域分布
-                                    var target = {
-                                        id: idx,
-                                        attributes: {
-                                            position: item[0],
-                                            name: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index]
-                                        },
-                                        position: item,
-                                        label: {
-                                            text: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index],
-                                            font: "14px Helvetica",
-                                            color: "#fff",
-                                            pixelOffset: [0, -40]
-                                        }
-                                    };
-                                    var options = {
-                                        isZoom: false,
-                                        camera: {
-                                            x: 121.4175597,
-                                            y: 31.119248,
-                                            radius: 18000.0,
-                                            offset: { heading: -4, pitch: -70, range: 0 },
-                                        },
-                                        click: regionLocateCallBack,
-                                        style: {
-                                            // color: name[index] == "华漕镇处置网格二（纪王西片区）" ? "#2c6395" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "#1b6cb6" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "#40a4ff" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "#8ac7ff" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "#b1cce5" : name[index] == "新虹街道处置网格二（爱博）" ? "#a03523" : name[index] == "新虹街道处置网格三（华美）" ? "#d71e00" : name[index] == "新虹街道处置网格一（枢纽）" ? "#ffa192" : name[index] == "新虹街道处置网格四（航华）" ? "#dba197" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "#009081" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "#00ae9c" : name[index] == "七宝镇处置网格五（航华网格）" ? "#50ffed" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "#b2ec0a" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "#b2ec4a" : "#729900",
-                                            color:"transparent",
-                                            transparency: 0,
-                                            outline: true,
-                                            outlineColor: 'blue',
+                                // 2区域分布
+                                var target = {
+                                    id: idx,
+                                    attributes: {
+                                        position: item[0],
+                                        name: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index]
+                                    },
+                                    position: item,
+                                    label: {
+                                        text: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index],
+                                        font: "14px Helvetica",
+                                        color: "#fff",
+                                        pixelOffset: [0, -40]
+                                    }
+                                };
+                                var options = {
+                                    isZoom: false,
+                                    camera: {
+                                        x: 121.4175597,
+                                        y: 31.119248,
+                                        radius: 18000.0,
+                                        offset: { heading: -4, pitch: -70, range: 0 },
+                                    },
+                                    click: regionLocateCallBack,
+                                    style: {
+                                        // color: name[index] == "华漕镇处置网格二（纪王西片区）" ? "#2c6395" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "#1b6cb6" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "#40a4ff" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "#8ac7ff" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "#b1cce5" : name[index] == "新虹街道处置网格二（爱博）" ? "#a03523" : name[index] == "新虹街道处置网格三（华美）" ? "#d71e00" : name[index] == "新虹街道处置网格一（枢纽）" ? "#ffa192" : name[index] == "新虹街道处置网格四（航华）" ? "#dba197" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "#009081" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "#00ae9c" : name[index] == "七宝镇处置网格五（航华网格）" ? "#50ffed" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "#b2ec0a" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "#b2ec4a" : "#729900",
+                                        color: "transparent",
+                                        transparency: 0,
+                                        outline: true,
+                                        outlineColor: 'blue',
 
-                                            // "#4d6700",
-                                            // "#729900",
-                                        }
+                                        // "#4d6700",
+                                        // "#729900",
+                                    }
 
-                                    };
-                                    setTimeout(() => {
-                                        jMap.Locate.regionLocate(target, options);
-                                    }, 500)
+                                };
+                                setTimeout(() => {
+                                    jMap.Locate.regionLocate(target, options);
+                                }, 500)
 
 
-                                    // 分布点点击事件的回调函数
-                                    function regionLocateCallBack(obj) {
-                                        console.log(obj)
-                                        that.stores.gridDataChange(obj._attributes);
-                                    }
+                                // 分布点点击事件的回调函数
+                                function regionLocateCallBack(obj) {
+                                    console.log(obj)
+                                    that.stores.gridDataChange(obj._attributes);
+                                }
 
-                                }, idx * 1)
+                            }, idx * 1)
                         })
                     }
                 }, 1000)
@@ -436,118 +434,119 @@ export default {
                         let a = []
                         for (let i = 0; i < obj.features.length; i++) {
                             a[i] = {
-                                    name: obj.features[i].attributes.name,
-                                    subdistrict: obj.features[i].attributes.subdistrict,
-                                }
+                                name: obj.features[i].attributes.name,
+                                subdistrict: obj.features[i].attributes.subdistrict,
+                            }
                         }
                         var big2Arr = []
                         obj.features.forEach(function(item, index) {
-                            var b2 = item.geometry.rings;
-                            b2.forEach(function(item2, index2) {
-                                var newArr2 = b2[index2].map(function(value, index3) {
-                                    var obj = {
-                                        x: value[0],
-                                        y: value[1],
-                                        z: 0.1
-                                    }
-                                    return obj
+                                var b2 = item.geometry.rings;
+                                b2.forEach(function(item2, index2) {
+                                    var newArr2 = b2[index2].map(function(value, index3) {
+                                        var obj = {
+                                            x: value[0],
+                                            y: value[1],
+                                            z: 0.1
+                                        }
+                                        return obj
+                                    })
+                                    big2Arr.push(newArr2);
+                                    name2.push(item.attributes.name)
                                 })
-                                big2Arr.push(newArr2);
-                                name2.push(item.attributes.name)
                             })
-                        })
-                         //画线---------------------------------
-                            let huaxian = []
-                            for(let i=0;i<big2Arr.length;i++){
-                                huaxian.push([])
-                                for(let ii =0;ii<big2Arr[i].length;ii++){
-                                    huaxian[i].push(
-                                        big2Arr[i][ii]
-                                    )
-                                }
+                            //画线---------------------------------
+                        let huaxian = []
+                        for (let i = 0; i < big2Arr.length; i++) {
+                            huaxian.push([])
+                            for (let ii = 0; ii < big2Arr[i].length; ii++) {
+                                huaxian[i].push(
+                                    big2Arr[i][ii]
+                                )
                             }
-                            for(let i=0;i<huaxian.length;i++){
-                                let target = {
-                                    id: i + 1,
-                                    attributes: {
-                                        name: i,
-                                    },
-                                    position: huaxian[i],
-                                    label: {
-                                        text: i,
-                                        font: "16px Helvetica",
-                                        color: "rgba(255,255,255,0.1)",
-                                        pixelOffset: [0, -50],
-                                        backgroundColor: "red"
-                                    }
-                    
+                        }
+                        for (let i = 0; i < huaxian.length; i++) {
+                            let target = {
+                                id: i + 1,
+                                attributes: {
+                                    name: i,
+                                },
+                                position: huaxian[i],
+                                label: {
+                                    text: i,
+                                    font: "16px Helvetica",
+                                    color: "rgba(255,255,255,0.1)",
+                                    pixelOffset: [0, -50],
+                                    backgroundColor: "red"
                                 }
-                                var options = {
-                                    isZoom: false,
-                                    style: {
-                                        color: 'rgb(1, 224, 255)',
-                                        transparency: 1,
-                                        outline: true,
-                                        outlineColor: 'transparent',
-                                        perPositionHeight: true
-                    
-                                    },
-                                    click: regionLocateCallBack111
-                                };
-                                setTimeout(() => {
-                                    window.jMap.Locate.trackLocate(target, options);
-                                }, 1000)
-                                
-                            }
-                            function regionLocateCallBack111(obj) {
-                                // console.log(obj);       // obj为返回值
+
                             }
-                         //画线---------------------------------
+                            var options = {
+                                isZoom: false,
+                                style: {
+                                    color: 'rgb(1, 224, 255)',
+                                    transparency: 1,
+                                    outline: true,
+                                    outlineColor: 'transparent',
+                                    perPositionHeight: true
+
+                                },
+                                click: regionLocateCallBack111
+                            };
+                            setTimeout(() => {
+                                window.jMap.Locate.trackLocate(target, options);
+                            }, 1000)
+
+                        }
+
+                        function regionLocateCallBack111(obj) {
+                            // console.log(obj);       // obj为返回值
+                        }
+                        //画线---------------------------------
                         //画区域-----------------------------
-                                big2Arr.forEach(function(item, index) {
-                                    var idx = index + 1;
-                                    setTimeout(() => {
-                                        // 2区域分布
-                                        var target = {
-                                            id: idx,
-                                            attributes: {
-                                                position: item[0],
-                                                name: name2[index]
-                                            },
-                                            position: item,
-                                            label: {
-                                                text: name2[index],
-                                                font: "12px Helvetica",
-                                                color: "transparent",
-                                                pixelOffset: [0, -40]
-                                            }
-                                        };
-                                        var options = {
-                                            isZoom: false,
-                                            click: regionLocateCallBack2,
-                                            style: {
-                                                color: "#68afc1",
-                                                transparency: 0.6,
-                                                outline: true,
-                                                outlineColor: 'blue',
-                                            }
-
-                                        };
-                                        setTimeout(() => {
-                                                jMap.Locate.regionLocate(target, options);
-                                            }, 500)
-                                            // 分布点点击事件的回调函数
-                                        function regionLocateCallBack2(obj) {
-                                            that.stores.gridDataChange(obj._attributes);
+                        big2Arr.forEach(function(item, index) {
+                                var idx = index + 1;
+                                setTimeout(() => {
+                                    // 2区域分布
+                                    var target = {
+                                        id: idx,
+                                        attributes: {
+                                            position: item[0],
+                                            name: name2[index]
+                                        },
+                                        position: item,
+                                        label: {
+                                            text: name2[index],
+                                            font: "12px Helvetica",
+                                            color: "transparent",
+                                            pixelOffset: [0, -40]
+                                        }
+                                    };
+                                    var options = {
+                                        isZoom: false,
+                                        click: regionLocateCallBack2,
+                                        style: {
+                                            color: "#68afc1",
+                                            transparency: 0.6,
+                                            outline: true,
+                                            outlineColor: 'blue',
                                         }
 
-                                    }, idx * 1)
-                                })
-                        //画区域-----------------------------
+                                    };
+                                    setTimeout(() => {
+                                            jMap.Locate.regionLocate(target, options);
+                                        }, 500)
+                                        // 分布点点击事件的回调函数
+                                    function regionLocateCallBack2(obj) {
+                                        that.stores.gridDataChange(obj._attributes);
+                                    }
+
+                                }, idx * 1)
+                            })
+                            //画区域-----------------------------
                     }
                 }, 2000);
             }
-             //大网格
+            //大网格
             if (id == 3) {
                 setTimeout(() => {
                     // 例： 8.1 2 查询图层列表
@@ -565,16 +564,16 @@ export default {
                         var bigNewArr = [];
                         var name = [];
                         var bigArr = obj.features.filter(function(el) {
-                            // return el.attributes.name.indexOf('新虹街道') > -1 
-                            return el.attributes.name.indexOf('新虹街道') > -1 ||
-                                el.attributes.name.indexOf('华漕') > -1 ||
-                                el.attributes.name.indexOf('七宝中片') > -1 ||
-                                el.attributes.name.indexOf('航华网格') > -1 ||
-                                el.attributes.name.indexOf('七宝北片网格') > -1 ||
-                                el.attributes.name.indexOf('紫藤、红松') > -1 ||
-                                el.attributes.name.indexOf('虹梅区域') > -1
-                        })
-                        //画区域
+                                // return el.attributes.name.indexOf('新虹街道') > -1 
+                                return el.attributes.name.indexOf('新虹街道') > -1 ||
+                                    el.attributes.name.indexOf('华漕') > -1 ||
+                                    el.attributes.name.indexOf('七宝中片') > -1 ||
+                                    el.attributes.name.indexOf('航华网格') > -1 ||
+                                    el.attributes.name.indexOf('七宝北片网格') > -1 ||
+                                    el.attributes.name.indexOf('紫藤、红松') > -1 ||
+                                    el.attributes.name.indexOf('虹梅区域') > -1
+                            })
+                            //画区域
                         bigArr.forEach(function(item, index) {
                             var aaa = item.geometry.rings[0];
                             var newArr = aaa.map(function(value, index) {
@@ -592,66 +591,66 @@ export default {
                         bigNewArr.forEach(function(item, index) {
                             var idx = index + 1;
                             setTimeout(() => {
-                                    // 2区域分布
-                                    var target = {
-                                        id: idx,
-                                        attributes: {
-                                            position: item[0],
-                                            name: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index]
-                                        },
-                                        position: item,
-                                        label: {
-                                            // text: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index],
-                                            font: "14px Helvetica",
-                                            color: "#fff",
-                                            pixelOffset: [0, -40]
-                                        }
-                                    };
-                                    var options = {
-                                        isZoom: false,
-                                        camera: {
-                                            x: 121.4175597,
-                                            y: 31.119248,
-                                            radius: 9000.0,
-                                            offset: { heading: -4, pitch: -70, range: 0 },
-                                        },
-                                        click: regionLocateCallBack,
-                                        style: {
-                                            color: "#5b9bd5",
-                                            transparency: 0.6,
-                                            // name[index] == "华漕镇处置网格二（纪王西片区）" ? "#5b9bd5" : 
-                                            // name[index] == "华漕镇处置网格一（纪王东片区）" ? "#5b9bd5" : 
-                                            // name[index] == "华漕镇处置网格四（诸翟北片区）" ? "#5b9bd5" : 
-                                            // name[index] == "华漕镇处置网格五（诸翟南片区）" ? "#5b9bd5" : 
-                                            // name[index] == "华漕镇处置网格三（老华漕片区）" ? "#5b9bd5" : 
-
-                                            // name[index] == "新虹街道处置网格二（爱博）" ? "#17cfbc" : 
-                                            // name[index] == "新虹街道处置网格三（华美）" ? "#17cfbc" : 
-                                            // name[index] == "新虹街道处置网格一（枢纽）" ? "#17cfbc" : 
-                                            // name[index] == "新虹街道处置网格四（航华）" ? "#17cfbc" : 
-
-                                            // name[index] == "七宝镇处置网格一（七宝北片网格）" ? "#fca091" : 
-                                            // name[index] == "七宝镇处置网格二（七宝中片网格）" ? "#fca091" : 
-                                            // name[index] == "七宝镇处置网格五（航华网格）" ? "#fca091" : 
-
-                                            // name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "rgb(37, 95, 37)" : 
-                                            // name[index] == "虹桥镇处置网格二（虹梅区域）" ? "rgb(37, 95, 37)" : "rgb(37, 95, 37)",
-                                            outline: true,
-                                            outlineColor: 'blue',
+                                // 2区域分布
+                                var target = {
+                                    id: idx,
+                                    attributes: {
+                                        position: item[0],
+                                        name: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index]
+                                    },
+                                    position: item,
+                                    label: {
+                                        // text: name[index] == "华漕镇处置网格二（纪王西片区）" ? "闵S1-1（纪王西网格）" : name[index] == "华漕镇处置网格一（纪王东片区）" ? "闵S1-2（纪王东网格）" : name[index] == "华漕镇处置网格四（诸翟北片区）" ? "闵S1-3（诸翟北网格）" : name[index] == "华漕镇处置网格五（诸翟南片区）" ? "闵S1-4（诸翟南网格）" : name[index] == "华漕镇处置网格三（老华漕片区）" ? "闵S1-5（老华漕网格）" : name[index] == "新虹街道处置网格二（爱博）" ? "闵S2-1（爱博网格）" : name[index] == "新虹街道处置网格三（华美）" ? "闵S2-2（华美网格）" : name[index] == "新虹街道处置网格一（枢纽）" ? "闵S2-3（枢纽网格）" : name[index] == "新虹街道处置网格四（航华）" ? "闵S2-4（航华网格）" : name[index] == "七宝镇处置网格一（七宝北片网格）" ? "闵S3-1（七宝北片网格）" : name[index] == "七宝镇处置网格二（七宝中片网格）" ? "闵S3-2（七宝吴宝路网格）" : name[index] == "七宝镇处置网格五（航华网格）" ? "闵S3-3（七宝航华网格）" : name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "闵S4-1（紫藤红松网格）" : name[index] == "虹桥镇处置网格二（虹梅区域）" ? "闵S4-2（虹梅网格）" : name[index],
+                                        font: "14px Helvetica",
+                                        color: "#fff",
+                                        pixelOffset: [0, -40]
+                                    }
+                                };
+                                var options = {
+                                    isZoom: false,
+                                    camera: {
+                                        x: 121.4175597,
+                                        y: 31.119248,
+                                        radius: 9000.0,
+                                        offset: { heading: -4, pitch: -70, range: 0 },
+                                    },
+                                    click: regionLocateCallBack,
+                                    style: {
+                                        color: "#5b9bd5",
+                                        transparency: 0.6,
+                                        // name[index] == "华漕镇处置网格二（纪王西片区）" ? "#5b9bd5" : 
+                                        // name[index] == "华漕镇处置网格一（纪王东片区）" ? "#5b9bd5" : 
+                                        // name[index] == "华漕镇处置网格四（诸翟北片区）" ? "#5b9bd5" : 
+                                        // name[index] == "华漕镇处置网格五（诸翟南片区）" ? "#5b9bd5" : 
+                                        // name[index] == "华漕镇处置网格三（老华漕片区）" ? "#5b9bd5" : 
+
+                                        // name[index] == "新虹街道处置网格二（爱博）" ? "#17cfbc" : 
+                                        // name[index] == "新虹街道处置网格三（华美）" ? "#17cfbc" : 
+                                        // name[index] == "新虹街道处置网格一（枢纽）" ? "#17cfbc" : 
+                                        // name[index] == "新虹街道处置网格四（航华）" ? "#17cfbc" : 
+
+                                        // name[index] == "七宝镇处置网格一（七宝北片网格）" ? "#fca091" : 
+                                        // name[index] == "七宝镇处置网格二（七宝中片网格）" ? "#fca091" : 
+                                        // name[index] == "七宝镇处置网格五（航华网格）" ? "#fca091" : 
+
+                                        // name[index] == "虹桥镇处置网格四（紫藤、红松区域）" ? "rgb(37, 95, 37)" : 
+                                        // name[index] == "虹桥镇处置网格二（虹梅区域）" ? "rgb(37, 95, 37)" : "rgb(37, 95, 37)",
+                                        outline: true,
+                                        outlineColor: 'blue',
 
-                                            // "#4d6700",
-                                            // "#729900",
-                                        }
+                                        // "#4d6700",
+                                        // "#729900",
+                                    }
 
-                                    };
-                                    setTimeout(() => {
+                                };
+                                setTimeout(() => {
                                         jMap.Locate.regionLocate(target, options);
                                     }, 500)
                                     // 分布点点击事件的回调函数
-                                    function regionLocateCallBack(obj) {
-                                        // that.stores.gridDataChange(obj._attributes);
-                                    }
-                                }, idx * 1)
+                                function regionLocateCallBack(obj) {
+                                    // that.stores.gridDataChange(obj._attributes);
+                                }
+                            }, idx * 1)
                         })
                     }
                 }, 1000)
@@ -848,9 +847,9 @@ export default {
                         },
                         image: {
                             url: type == "双随机执法单位" ? this.stores.sadianIcon.ssjzf : type == "安全检查单位" ? this.stores.sadianIcon.aqjcdw : type == "举报投诉" ? this.stores.sadianIcon.jbts : type == "执法记录仪" && val.type == "执法记录仪" ? this.stores.sadianIcon.zfjly :
-                                
+
                                 type == "执法记录仪" && val.type == "国家会展中心" ? this.stores.sadianIcon.hzzx :
-                                
+
                                 type == "重点单位" ? this.stores.sadianIcon.zddw : type == "龙湖天街（试点）" ? this.stores.sadianIcon.lhtj : type == "一般单位" ? this.stores.sadianIcon.ybdw : type == "九小场所" ? this.stores.sadianIcon.jxcs : type == "其他单位" ? this.stores.sadianIcon.qtdw :
 
                                 type == "厂房" ? this.stores.sadianIcon.cf : type == "仓库" ? this.stores.sadianIcon.ck :
@@ -889,13 +888,8 @@ export default {
 
                                 type == "高风险" ? this.stores.sadianIcon.gfx : type == "较高风险" ? this.stores.sadianIcon.jgfx : type == "一般风险" ? this.stores.sadianIcon.ybfx : type == "低风险" ? this.stores.sadianIcon.dfx :
 
-                                type == "单位巡检" ? this.stores.sadianIcon.dwxj : type == "物联网设备" ? this.stores.sadianIcon.dwxj : type == "监控视频" ? this.stores.sadianIcon.ssjq : type == "监督检查" ? this.stores.sadianIcon.jdjc :
-                                type == "养老机构" ?  this.stores.sadianIcon.xfdjl :
-                                type == "医疗机构" ?  this.stores.sadianIcon.zzd :
-                                type == "流动消防站（一级）" ?  this.stores.sadianIcon.ldxfzyj :
-                                type == "流动消防站（二级）" ?  this.stores.sadianIcon.ldxfzej :
-                                type == "重点微型消防站" ?  this.stores.sadianIcon.zdwxxfz :
-                                
+                                type == "单位巡检" ? this.stores.sadianIcon.dwxj : type == "物联网设备" ? this.stores.sadianIcon.dwxj : type == "监控视频" ? this.stores.sadianIcon.ssjq : type == "监督检查" ? this.stores.sadianIcon.jdjc : type == "养老机构" ? this.stores.sadianIcon.xfdjl : type == "医疗机构" ? this.stores.sadianIcon.zzd : type == "流动消防站（一级）" ? this.stores.sadianIcon.ldxfzyj : type == "流动消防站（二级）" ? this.stores.sadianIcon.ldxfzej : type == "重点微型消防站" ? this.stores.sadianIcon.zdwxxfz :
+
 
                                 this.stores.sadianIcon.trsy,
 
@@ -1299,13 +1293,13 @@ export default {
                                         ["设立原因：", msgParse.test6, 24],
                                         ["驻防时间：", msgParse.test7, 24],
                                         ["视频设备编号：", msgParse.test8, 24],
-                                        ["跟车人员姓名及岗位1：",`${msgParse.test10} ${msgParse.test9}`, 24],
-                                        ["跟车人员姓名及岗位2：",`${msgParse.test12} ${msgParse.test11}`, 24],
-                                        ["跟车人员姓名及岗位3：",`${msgParse.test14} ${msgParse.test14}`, 24],
-                                        ["跟车人员姓名及岗位4：",`${msgParse.test16} ${msgParse.test15}`, 24],
-                                        ["跟车人员姓名及岗位5：",`${msgParse.test18} ${msgParse.test17}`, 24],
-                                        ["跟车人员姓名及岗位6：",`${msgParse.test20} ${msgParse.test19}`, 24],
-                                        ["跟车人员姓名及岗位7：",`${msgParse.test22} ${msgParse.test21}`, 24],
+                                        ["跟车人员姓名及岗位1：", `${msgParse.test10} ${msgParse.test9}`, 24],
+                                        ["跟车人员姓名及岗位2：", `${msgParse.test12} ${msgParse.test11}`, 24],
+                                        ["跟车人员姓名及岗位3：", `${msgParse.test14} ${msgParse.test14}`, 24],
+                                        ["跟车人员姓名及岗位4：", `${msgParse.test16} ${msgParse.test15}`, 24],
+                                        ["跟车人员姓名及岗位5：", `${msgParse.test18} ${msgParse.test17}`, 24],
+                                        ["跟车人员姓名及岗位6：", `${msgParse.test20} ${msgParse.test19}`, 24],
+                                        ["跟车人员姓名及岗位7：", `${msgParse.test22} ${msgParse.test21}`, 24],
                                         ["户号：", msgParse.test23, 24],
                                         ["车型：", msgParse.test24, 24],
                                         ["车辆号牌：", msgParse.test25, 24],
@@ -1315,7 +1309,7 @@ export default {
                                         ["总质量：", msgParse.test33, 24],
                                         ["乘员数：", msgParse.test34, 24],
 
-                                        ["云梯高度(米)、油箱容量（升）：",`${msgParse.test35} 、${msgParse.test36}`, 24],
+                                        ["云梯高度(米)、油箱容量（升）：", `${msgParse.test35} 、${msgParse.test36}`, 24],
                                         ["发动机功率（千瓦）：", msgParse.test37, 24],
                                         ["水泵流量（升/分钟）：", msgParse.test38, 24],
 
@@ -1324,8 +1318,8 @@ export default {
 
                                         ["名称修改为（载水量）：", msgParse.test41, 24],
                                         ["泡沫容量（吨）：", msgParse.test42, 24],
-                                       
-                                  
+
+
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1345,8 +1339,8 @@ export default {
                                         ["驻防时间：", msgParse.test3, 24],
                                         ["定位设备编号：", msgParse.test4, 24],
                                         ["对讲设备编号：", msgParse.test5, 24],
-                                        ["跟车人员姓名及岗位：",`${msgParse.test7} ${msgParse.test6}`, 24],
-                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
+                                        ["跟车人员姓名及岗位：", `${msgParse.test7} ${msgParse.test6}`, 24],
+                                        ["跟车人员姓名及岗位：", `${msgParse.test9} ${msgParse.test8}`, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1358,14 +1352,13 @@ export default {
                                     children: [
                                         ["街镇：", val.attrbutes.streetTown, 24],
                                         ["地址：", val.attrbutes.address, 24],
-                                        ["名称：", val.attrbutes.facilityName, 24],,
+                                        ["名称：", val.attrbutes.facilityName, 24],
                                         ["负责人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
 
                                         ["支队：", msgParse.test1, 24],
                                         ["性质：", msgParse.test2, 24],
                                         ["固定电话：", msgParse.test3, 24],
-                                        ["微站可视化终端名称：", msgParse.test4, 24],
                                         ["是否配备电动车：", msgParse.test5, 24],
                                         ["备注：", msgParse.test6, 24],
                                     ],
@@ -1380,7 +1373,7 @@ export default {
                                         ["宾馆酒店名称：", val.attrbutes.facilityName, 24],
                                         ["街镇：", val.attrbutes.streetTown, 24],
                                         ["地址：", val.attrbutes.address, 24],
-                                        ["房间数：",msgParse.test1, 24],
+                                        ["房间数：", msgParse.test1, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1393,8 +1386,8 @@ export default {
                                         ["单位名称：", val.attrbutes.facilityName, 24],
                                         ["街镇：", val.attrbutes.streetTown, 24],
                                         ["地址：", val.attrbutes.address, 24],
-                                        ["管理人：",msgParse.test1, 24],
-                                        ["电话：",msgParse.test2, 24],
+                                        ["管理人：", msgParse.test1, 24],
+                                        ["电话：", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1409,7 +1402,7 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         // ["所属单位：",msgParse.test1, 24],
                                         // ["公司名称：",msgParse.test2, 24],
-                                        ["公司负责人及联系方式：",`${msgParse.test3} ${msgParse.test4}`, 24],
+                                        ["公司负责人及联系方式：", `${msgParse.test3} ${msgParse.test4}`, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1424,7 +1417,7 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         ["联系人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
-                                        
+
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1439,8 +1432,8 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         ["联系人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
-                                        ["建筑面积 ( 平方米 )：",msgParse.test1, 24],
-                                        ["房间数量(间)：",msgParse.test2, 24],
+                                        ["建筑面积 ( 平方米 )：", msgParse.test1, 24],
+                                        ["房间数量(间)：", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1455,14 +1448,68 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         ["联系人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
-                                        ["住宿人员数量：",msgParse.test1, 24],
-                                        ["是否整改：",msgParse.test2, 24],
+                                        ["住宿人员数量：", msgParse.test1, 24],
+                                        ["是否整改：", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            //     if (type == "重点微型消防站") {
+                            //         let msgParse = JSON.parse(val.attrbutes.extendData)
+                            //         console.log(msgParse)
+                            //         let arrayList = [{
+                            //             title: [type, true],
+                            //             children: [
+                            //                 ["单位名称：", val.attrbutes.facilityName, 24],
+                            //                 ["街镇：", val.attrbutes.streetTown, 24],
+                            //                 ["地址：", val.attrbutes.address, 24],
+                            //                 ["联系人：", val.attrbutes.contact, 24],
+                            //                 ["联系电话：", val.attrbutes.contactPhone, 24],
+                            //                 ["支队：", msgParse.test1, 24],
+                            //                 ["性质：", msgParse.test2, 24],
+                            //                 ["固定电话：", msgParse.test3, 24],
+                            //                 ["是否配备电动车：", msgParse.test5, 24],
+                            //                 ["备注：", msgParse.test6, 24],
+
+                            //             ],
+                            //         }, ];
+                            //         console.log(arrayList)
+                            //         this.popup(val._attrbutes, arrayList, true)
+                            //     }
                             //疏导区单位情况----------------------
+                            //四色分级
+                            if (type == "高风险" || type == "较高风险" || type == "一般风险" || type == "低风险") {
+                                if (val.attrbutes.extendData) {
+                                    let msgParse = JSON.parse(val.attrbutes.extendData)
+                                        //九小场所
+                                    if (val.attrbutes.facilityType == 39) {
+                                        let arrayList = [{
+                                            title: [val.attrbutes.facilityName, true],
+                                            children: [
+                                                ["所属街镇：", val.attrbutes.streetTown, 12],
+                                                ["网格号：", msgParse.facilityNum, 12],
+                                                ["位置：", val.attrbutes.address, 24],
+                                                ["统一社会代码：", msgParse.test5, 24],
+                                                ["场所面积：", msgParse.test7, 12],
+                                                ["安全责任人：", val.attrbutes.contact, 12],
+                                                ["安全管理人：", msgParse.test6, 12],
+                                                ["单位类型：", msgParse.test3, 12],
+                                                ["单位使用性质：", msgParse.test4, 12],
+                                                ["建筑性质：", msgParse.test8, 12],
+                                                ["建筑结构：", msgParse.test9, 12],
+                                                ["隐患扣分：", msgParse.test111, 12],
+                                                //     ["隐患等级：", val.attrbutes.address, 24],
+                                                ["风险等级：", msgParse.test112, 12],
+
+                                            ],
+                                        }, ];
+                                        this.popup(val._attrbutes, arrayList, true)
+                                    }
+
 
+                                }
+
+                            }
                             //疏导区基本情况----------------------
                             if (type == "学校") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
@@ -1474,10 +1521,10 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         ["联系人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
-                                        ["场所名称：",msgParse.test1, 24],
-                                        ["法定代表人：",msgParse.test2, 24],
-                                        ["主标签：",msgParse.test3, 24],
-                                        ["次标签：",msgParse.test4, 24],
+                                        ["场所名称：", msgParse.test1, 24],
+                                        ["法定代表人：", msgParse.test2, 24],
+                                        ["主标签：", msgParse.test3, 24],
+                                        ["次标签：", msgParse.test4, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1497,7 +1544,7 @@ export default {
                                 this.popup(val._attrbutes, arrayList, true)
                             }
 
-                            
+
                         }
                         //火灾数据分析
                         if (pageType == "fire-data-analysis") {
@@ -1540,7 +1587,7 @@ export default {
                                         ["受伤人数：", val.attrbutes.injuredNumber + "人", 24],
                                         ["起火经过：", val.attrbutes.fireProcess, 24],
                                     ],
-                                }, ];                                      
+                                }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
                         }
@@ -1698,7 +1745,7 @@ export default {
                 });
             }
         },
-         /**
+        /**
          * 点分布（撒点四叶草 安保专用）
          * @param {坐标信息} lnglats
          * @param {页面类型} type
@@ -1722,7 +1769,7 @@ export default {
                         },
                         image: {
                             url: type == "国家会展中心" ? this.stores.sadianIcon.hzzx : this.stores.sadianIcon.zdwxxfz,
-                            width: val.type == "国家会展中心" ? 83  : 19.5,
+                            width: val.type == "国家会展中心" ? 83 : 19.5,
                             height: val.type == "国家会展中心" ? 59 : 25,
                         },
                     };
@@ -1754,12 +1801,12 @@ export default {
                 },
             });
         },
-         /**
+        /**
          * 点分布（网格名称 安保专用）
          * @param {坐标信息} lnglats
          * @param {页面类型} type
          */
-         addMarkerWG(lnglats, pageType, type) {
+        addMarkerWG(lnglats, pageType, type) {
             let that = this
             let icon = "";
             var target = lnglats.map((val, ind) => {
@@ -1777,23 +1824,11 @@ export default {
                             z: 0
                         },
                         image: {
-                            url: val.type == "wgmc_hc" ? this.stores.sadianIcon.wgmc_hc : 
-                            val.type == "wgmc_xh" ? this.stores.sadianIcon.wgmc_xh : 
-                            val.type == "wgmc_qb" ? this.stores.sadianIcon.wgmc_qb : 
-                            val.type == "wgmc_hq" ? this.stores.sadianIcon.wgmc_hq : 
-                            val.type == "国家会展中心" ? this.stores.sadianIcon.hzzx :this.stores.sadianIcon.zdwxxfz,
-
-                            width: val.type == "wgmc_hc" ? 98 : 
-                            val.type == "wgmc_xh" ? 98 : 
-                            val.type == "wgmc_qb" ? 98 : 
-                            val.type == "wgmc_hq" ? 98 : 
-                            val.type == "国家会展中心" ? 83 : 19.5,
-                            
-                            height: val.type == "wgmc_hc" ? 33 :  
-                            val.type == "wgmc_xh" ? 33 :  
-                            val.type == "wgmc_qb" ? 33 :  
-                            val.type == "wgmc_hq" ? 33 :  
-                            val.type == "国家会展中心" ? 59 : 25,
+                            url: val.type == "wgmc_hc" ? this.stores.sadianIcon.wgmc_hc : val.type == "wgmc_xh" ? this.stores.sadianIcon.wgmc_xh : val.type == "wgmc_qb" ? this.stores.sadianIcon.wgmc_qb : val.type == "wgmc_hq" ? this.stores.sadianIcon.wgmc_hq : val.type == "国家会展中心" ? this.stores.sadianIcon.hzzx : this.stores.sadianIcon.zdwxxfz,
+
+                            width: val.type == "wgmc_hc" ? 98 : val.type == "wgmc_xh" ? 98 : val.type == "wgmc_qb" ? 98 : val.type == "wgmc_hq" ? 98 : val.type == "国家会展中心" ? 83 : 19.5,
+
+                            height: val.type == "wgmc_hc" ? 33 : val.type == "wgmc_xh" ? 33 : val.type == "wgmc_qb" ? 33 : val.type == "wgmc_hq" ? 33 : val.type == "国家会展中心" ? 59 : 25,
                         },
                     };
                     return marker;

src/views/security-plan.vue

@@ -387,10 +387,7 @@
                             <el-col><a href="http://32.0.15.107:8080/mhvi/20231024.pdf" target="_blank">第二期 第六届中国国际进口博览会每日工作动态</a></el-col>
                             <el-col><a href="http://32.0.15.107:8080/mhvi/20231023.pdf" target="_blank">第一期 第六届中国国际进口博览会每日工作动态</a></el-col>
                         </el-row> -->
-                 
-                        <el-row>
-                            <el-col>今日支队领导视察指挥中心</el-col>
-                        </el-row>
+                
                     </div>
                    
                     
@@ -468,10 +465,10 @@
                         </el-row>
                         <el-row class="row_g2">
                             <el-col :span="8">九小场所</el-col>
-                            <el-col :span="4" style="color:red">高风险<br>151（家）</el-col>
-                            <el-col :span="4" style="color:orange">较高风险<br>278（家）</el-col>
-                            <el-col :span="4" style="color:yellow">一般风险<br>114（家）</el-col>
-                            <el-col :span="4" style="color:green">低风险<br>4026（家）</el-col>
+                            <el-col :span="4"  style="color:red" @click="basicStaticsData(39,'高风险')" >高风险<br>151（家）</el-col>
+                            <el-col :span="4" style="color:orange" @click="basicStaticsData(39,'较高风险')" >较高风险<br>278（家）</el-col>
+                            <el-col :span="4" style="color:yellow" @click="basicStaticsData(39,'一般风险')">一般风险<br>114（家）</el-col>
+                            <el-col :span="4" style="color:green" @click="basicStaticsData(39,'低风险')">低风险<br>4026（家）</el-col>
                         </el-row>
 
                     </div>
@@ -1283,11 +1280,11 @@ export default {
         selectVideoData: [],
             tabsArea: "fx", //切换
             diversionArea: [
-                { name: "疏导区总面积", value: 57.41, unit: "km²", color: "#7DD807" },
+                { name: "疏导区总面积", value: 61.46, unit: "km²", color: "#7DD807" },
                 { name: "华漕镇", value: 28.2, unit: "km²", color: "#01C3B4" },
-                { name: "新虹街道", value: 2, unit: "km²", color: "#01C3B4" },
+                { name: "新虹街道", value: 19.26, unit: "km²", color: "#01C3B4" },
                 { name: "七宝镇", value: 7, unit: "k㎡", color: "#01C3B4" },
-                { name: "虹桥镇", value: 2.95, unit: "km²", color: "#01C3B4" },
+                { name: "虹桥镇", value: 7, unit: "km²", color: "#01C3B4" },
                 
                 { name: "分管领导", value: 20, unit: "人", color: "#058DFE" },
                 { name: "增援干部", value: 11, unit: "人", color: "#058DD1" },
@@ -1752,10 +1749,11 @@ export default {
             this.addMarker(arr, "security-plan", val)
         },
         goPoints(type){
-            // alert(type)
+                this.anbaoSDUWG()
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [type ] 
                         }).then((res) => {
+                                
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
@@ -1770,6 +1768,7 @@ export default {
                                         }else if(type=='36'){
                                             this.addMarker(arr, "security-plan", "重点微型消防站")
                                         }
+                                        
                                 }  
                         });
 
@@ -1790,7 +1789,23 @@ export default {
                                             type: "国家会展中心",
                                         };
                                         arr.push(data)
-                                        this.addMarker(arr, "security-plan", name)
+                                        let dataOther = []
+                                        if(type == 39){
+                                                for(let i=0;i<1300;i++){
+                                                        if(arr[i].extendData){
+                                                                // console.log(i,JSON.parse(arr[i].extendData).test112,name)
+                                                                if(name == JSON.parse(arr[i].extendData).test112){
+                                                                        dataOther.push(arr[i])
+                                                                }
+                                                        }
+                                                        
+                                                }
+                                                // console.log(dataOther,name)
+                                                this.addMarker(dataOther, "security-plan", name)
+                                        }else{
+                                                this.addMarker(arr, "security-plan", name)
+                                        }
+                                        
                                         // if(type=='29'){
                                         //     this.addMarker(arr, "security-plan", "养老机构")
                                         // }else if(type=='30'){
@@ -3387,7 +3402,8 @@ export default {
                 display: inline-block;
                 a{
                     color:#fff;
-                    text-decoration: none;
+                    border-bottom:1px solid #fff;
+                //     text-decoration: none;
                 }
             }
         }
@@ -3438,9 +3454,11 @@ export default {
                     margin-top:10px;
                     width:100%;
                     div:first-child{
-                        width:1.5rem
+                        width:1.5rem;
+                        cursor:text;
                     }
                     div{
+                        cursor: pointer;
                         display: inline-block;
                         font-size:.155rem;
                         margin-top:.125rem;