网格地图调整

src/components/mixins/map-data1 copy.js

@@ -350,25 +350,45 @@ export default {
                         //         '航华一村第六居委会'
                         //     ) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
                         // queryWhere: `name in (${queryName}) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
-                        queryWhere: `subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
-                        // queryWhere: `grid_type in ('居委网格','村委网格','拓展网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
+                        // queryWhere: `subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
+                        queryWhere: `grid_type in ('居委网格','村委网格','拓展网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
                         outFields: ["*"], //  返回字段信息
                         callBack: testQueryCallBack3
                     });
                     JmapQuery.execQuery(qp3);
 
                     function testQueryCallBack3(obj) {
-                        console.log("所有",obj)
+                        // console.log("所有",obj)
                         let a = []
+                        // let b = []
                         for (let i = 0; i < obj.features.length; i++) {
                             a[i] = {
                                     name: obj.features[i].attributes.name,
                                     subdistrict: obj.features[i].attributes.subdistrict,
                                 }
+                            // b[i]= {
+                            //     gridArea:obj.features[i].attributes.grid_type,
+                            //     mapGridName:obj.features[i].attributes.name,
+                            //     streetTown:obj.features[i].attributes.subdistrict,
+                            // }
+
                                 // name2.push(obj.features[i].attributes.name)
                                 // console.log(obj.features[i].attributes.grid_type)
                         }
-                        // console.log(a)
+                        // console.log(b)
+                        // let c = []
+                        // for(let i=0;i<b.length;i++){
+                        //     for(let aa =0;aa<query.length;aa++){
+                        //         if(query[aa].mapGridName == b[i].mapGridName){
+                        //             c[aa]= {
+                        //                 gridArea:b[i].gridArea,
+                        //                 mapGridName:b[i].mapGridName,
+                        //                 streetTown:b[i].streetTown,
+                        //             }  
+                        //         }
+                        //     }
+                        // }
+                        // console.log(c)
                         var big2Arr = []
                         obj.features.forEach(function(item, index) {
                             var b2 = item.geometry.rings;
@@ -782,8 +802,12 @@ 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.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,
 
@@ -1107,7 +1131,7 @@ export default {
                         }
                         //大型安保 、火灾数据分析
                         if (pageType == "security-plan") {
-
+                            console.log(pageType,type)
                             // let arrayList = [{
                             //     title: ["案件详情", true],
                             //     children: [
@@ -1172,32 +1196,95 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "养老机构安全隐患清单") {
-                                console.log(val.attrbutes)
+                            if (type == "养老机构") {
                                 let arrayList = [{
-                                    title: ["养老机构安全隐患清单", true],
+                                    title: [type, true],
                                     children: [
-                                        ["设施名称：", val.attrbutes.facilityName, 24],
-                                        ["设施类型：", val.attrbutes.facilityType, 24],
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        // ["设施类型：", val.attrbutes.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "医疗机构安全隐患清单") {
+                            if (type == "医疗机构") {
                                 console.log(val.attrbutes)
                                 let arrayList = [{
-                                    title: ["医疗机构安全隐患清单", true],
+                                    title: [type, true],
                                     children: [
-                                        ["设施名称：", val.attrbutes.facilityName, 24],
-                                        ["设施类型：", val.attrbutes.facilityType, 24],
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        // ["设施类型：", val.attrbutes.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            if (type == "流动消防站（一级）") {
+                                console.log(222222222)
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [val.attrbutes.facilityName, true],
+                                    children: [
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["驻防位置：", val.attrbutes.address, 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.test7} ${msgParse.test6}`, 24],
+                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "流动消防站（二级）") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [val.attrbutes.facilityName, true],
+                                    children: [
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["驻防位置：", val.attrbutes.address, 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.test7} ${msgParse.test6}`, 24],
+                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "重点微型消防站") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [val.attrbutes.facilityName, true],
+                                    children: [
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 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],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
                         }
                         //火灾数据分析
                         if (pageType == "fire-data-analysis") {
@@ -1819,7 +1906,6 @@ export default {
                     }
                     for (let i = 0; i < arrayList[0].children.length; i++) {
                         if (arrayList[0].children[i][1]) {
-
                             let textWrap = document.createElement('div');
                             textWrap.setAttribute('style', 'font-size:14px;color:#fff;line-height:25px;');
                             let p1 = document.createElement('span');

src/components/mixins/map-data1.js

@@ -59,10 +59,11 @@ export default {
                 style: {
                     outline: true,
                     outlineColor: "rgb(255,0,0,0.8)",
-                    material: "rgb(154,255,154,0)",
-                    perPositionHeight: false,
-                    height: 5,
-                    width: 5,
+                    // material: "rgb(154,255,154,0)",
+                    perPositionHeight: true,
+                    height: 200,
+                    width: "10px",
+                    size:"10px",
                     label: {
                         show: true,
                         text: "name",
@@ -170,9 +171,71 @@ export default {
                     JmapQuery.execQuery(qp2);
                     // 图层查询完毕的回调函数
                     function testQueryCallBack2(obj) {
-
                         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
+
+                        })
+                        let arr = []
+                        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 i=0;i<arr.length;i++){
+                            let target = {
+                                id: i + 1,
+                                attributes: {
+                                    name: i,
+                                },
+                                position: arr[i],
+                                label: {
+                                    text: i,
+                                    font: "16px Helvetica",
+                                    color: "red",
+                                    pixelOffset: [0, -50],
+                                    backgroundColor: "red"
+                                }
+                
+                            }
+                            var options = {
+                                isZoom: false,
+                                style: {
+                                    color: 'rgb(79, 226, 97)',
+                                    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 bigArr = obj.features.filter(function(el) {
                             return el.attributes.name.indexOf('新虹街道') > -1 ||
                                 el.attributes.name.indexOf('华漕') > -1 ||
@@ -197,7 +260,6 @@ export default {
                             name.push(item.attributes.name)
 
                         })
-                        let arrayAll = [];
                         bigNewArr.forEach(function(item, index) {
                             var idx = index + 1;
                             setTimeout(() => {
@@ -217,7 +279,7 @@ export default {
                                         }
                                     };
                                     var options = {
-                                        isZoom: 10,
+                                        isZoom: false,
                                         camera: {
                                             x: 121.4175597,
                                             y: 31.119248,
@@ -226,8 +288,9 @@ export default {
                                         },
                                         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",
-                                            transparency: 0.6,
+                                            // 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',
 
@@ -247,9 +310,6 @@ export default {
                                     }
 
                                 }, idx * 1)
-                                // item.forEach(function(i) {
-                                //     arrayAll.push(i)
-                                // })
                         })
                     }
                 }, 1000)
@@ -272,123 +332,23 @@ export default {
                         // queryWhere: "name like '%纪东村村委会%' ", //  可自定义查询条件，也可不传该参数
                         // queryWhere: "grid_type in ('居委网格','村委网格') and subdistrict like '%华漕镇%' ", //  可自定义查询条件，也可不传该参数
                         // queryWhere: `name in ('沪星村村委会','九星村村委会','新龙村经济合作社','中春路第二居委会',
-                        //         '万科第四居委会',
-                        //         '万科城市花园第二居委会',
-                        //         '中春路居委会',
-                        //         '佳宝新村第一居委会',
-                        //         '万科城市花园第三居委会',
-                        //         '万科城市花园居委会',
-                        //         '沪星村村委会',
-                        //         '新龙村经济合作社',
-                        //         '吴宝路第一居委会',
-                        //         '塘北居委会',
-                        //         '塘南居委会',
-                        //         '吴宝路第二居委会',
-                        //         '吴宝路第三居委会',
-                        //         '蒲汇新村居委会',
-                        //         '京都苑居委会',
-                        //         '号上村经济合作社',
-                        //         '新龙村经济合作社',
-                        //         '航华一村第三居委会',
-                        //         '航华一村第四居委会',
-                        //         '航华二村第一居委会',
-                        //         '航华二村第四居委会',
-                        //         '航华一村第一居委会',
-                        //         '航华二村第三居委会',
-                        //         '航华四村第一居委会',
-                        //         '航华四村第四居委会',
-                        //         '航华四村第三居委会',
-                        //         '七韵美地苑居委会',
-                        //         '航华四村第二居委会',
-                        //         '航华三村第一居委会',
-                        //         '漕宝路居委会',
-                        //         '龙柏一村第一居委会',
-                        //         '龙柏一村第二居委会',
-                        //         '龙柏二村居委会',
-                        //         '兰竹居委会',
-                        //         '金汇华光城居委会',
-                        //         '西郊居委会',
-                        //         '虹鹿居委会',
-                        //         '红春公司',
-                        //         '华光花园居委会',
-                        //         '虹华苑居委会',
-                        //         '测绘院地图网格名称',
-                        //         '许浦村村委会',
-                        //         '西郊城第一居委会',
-                        //         '华漕村村委会',
-                        //         '南华路居委会',
-                        //         '王泥浜村村委会',
-                        //         '紫薇新村居委会',
-                        //         '诸翟村村委会',
-                        //         '诸翟居委会',
-                        //         '九韵城居委会',
-                        //         '诸新路居委会',
-                        //         '金丰城第一居委会',
-                        //         '美邻苑居委会',
-                        //         '爱博六村居委会',
-                        //         '杨家巷村村委会',
-                        //         '闵北路居委会(筹)',
-                        //         '西郊虹韵城居委会',
-                        //         '陈家角村村委会',
-                        //         '石皮弄村村委会',
-                        //         '纪东村村委会',
-                        //         '纪王居委会',
-                        //         '纪王村村委会',
-                        //         '银杏新村居委会',
-                        //         '红卫村村委会',
-                        //         '卫星村村委会',
-                        //         '纪西村村委会',
-                        //         '赵家村村委会',
-                        //         '鹫山村村委会',
-                        //         '爱博一村居委会',
-                        //         '爱博二村居委会',
-                        //         '爱博三村居委会',
-                        //         '爱博四村居委会',
-                        //         '华美路第二居委会',
-                        //         '航华一村第二居委会',
-                        //         '航华一村第五居委会',
-                        //         '航华一村第六居委会'
                         //     ) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
-                        // queryWhere: `name in (${queryName}) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
+                        queryWhere: `name in (${queryName}) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
                         // queryWhere: `subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
-                        queryWhere: `grid_type in ('居委网格','村委网格','扩展网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
+                        // queryWhere: `grid_type in ('居委网格','村委网格','拓展网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件，也可不传该参数
                         outFields: ["*"], //  返回字段信息
                         callBack: testQueryCallBack3
                     });
                     JmapQuery.execQuery(qp3);
 
                     function testQueryCallBack3(obj) {
-                        // console.log("所有",obj)
                         let a = []
-                        // let b = []
                         for (let i = 0; i < obj.features.length; i++) {
                             a[i] = {
                                     name: obj.features[i].attributes.name,
                                     subdistrict: obj.features[i].attributes.subdistrict,
                                 }
-                            // b[i]= {
-                            //     gridArea:obj.features[i].attributes.grid_type,
-                            //     mapGridName:obj.features[i].attributes.name,
-                            //     streetTown:obj.features[i].attributes.subdistrict,
-                            // }
-
-                                // name2.push(obj.features[i].attributes.name)
-                                // console.log(obj.features[i].attributes.grid_type)
                         }
-                        // console.log(b)
-                        // let c = []
-                        // for(let i=0;i<b.length;i++){
-                        //     for(let aa =0;aa<query.length;aa++){
-                        //         if(query[aa].mapGridName == b[i].mapGridName){
-                        //             c[aa]= {
-                        //                 gridArea:b[i].gridArea,
-                        //                 mapGridName:b[i].mapGridName,
-                        //                 streetTown:b[i].streetTown,
-                        //             }  
-                        //         }
-                        //     }
-                        // }
-                        // console.log(c)
                         var big2Arr = []
                         obj.features.forEach(function(item, index) {
                             var b2 = item.geometry.rings;
@@ -406,50 +366,100 @@ export default {
                             })
                         })
 
-                        big2Arr.forEach(function(item, index) {
-                            var idx = index + 1;
-                            setTimeout(() => {
-                                // 2区域分布
-                                var target = {
-                                    id: idx,
+                        console.log(222,big2Arr)
+                         //画线---------------------------------
+                            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: {
-                                        position: item[0],
-                                        name: name2[index]
+                                        name: i,
                                     },
-                                    position: item,
+                                    position: huaxian[i],
                                     label: {
-                                        text: name2[index],
-                                        font: "12px Helvetica",
-                                        color: "transparent",
-                                        pixelOffset: [0, -40]
+                                        text: i,
+                                        font: "16px Helvetica",
+                                        color: "rgba(255,255,255,0.1)",
+                                        pixelOffset: [0, -50],
+                                        backgroundColor: "red"
                                     }
-                                };
+                    
+                                }
                                 var options = {
-                                    isZoom: true,
-                                    click: regionLocateCallBack2,
+                                    isZoom: false,
                                     style: {
-                                        color: "#68afc1",
-                                        transparency: 0.6,
+                                        color: 'rgb(1, 224, 255)',
+                                        transparency: 1,
                                         outline: true,
-                                        outlineColor: 'blue',
-                                    }
-
+                                        outlineColor: 'transparent',
+                                        perPositionHeight: true
+                    
+                                    },
+                                    click: regionLocateCallBack111
                                 };
                                 setTimeout(() => {
-                                        jMap.Locate.regionLocate(target, options);
-                                    }, 500)
-                                    // 分布点点击事件的回调函数
-                                function regionLocateCallBack2(obj) {
-                                    that.stores.gridDataChange(obj._attributes);
-                                }
+                                    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);
+                                        }
 
-                            }, idx * 1)
-                        })
+                                    }, idx * 1)
+                                })
+                        //画区域-----------------------------
                     }
                 }, 2000);
             }
              //大网格
-             if (id == 3) {
+            if (id == 3) {
                 setTimeout(() => {
                     // 例： 8.1 2 查询图层列表
                     var qp2 = new JMapQueryParam({
@@ -463,10 +473,10 @@ export default {
                     JmapQuery.execQuery(qp2);
                     // 图层查询完毕的回调函数
                     function testQueryCallBack2(obj) {
-
                         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 ||
@@ -474,8 +484,8 @@ export default {
                                 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) {
@@ -490,7 +500,6 @@ export default {
                             name.push(item.attributes.name)
 
                         })
-                        let arrayAll = [];
                         bigNewArr.forEach(function(item, index) {
                             var idx = index + 1;
                             setTimeout(() => {
@@ -510,34 +519,34 @@ export default {
                                         }
                                     };
                                     var options = {
-                                        isZoom: 10,
+                                        isZoom: false,
                                         camera: {
                                             x: 121.4175597,
                                             y: 31.119248,
-                                            radius: 18000.0,
+                                            radius: 9000.0,
                                             offset: { heading: -4, pitch: -70, range: 0 },
                                         },
                                         click: regionLocateCallBack,
                                         style: {
-                                            color: 
-                                            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)",
+                                            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',
 
@@ -549,17 +558,11 @@ export default {
                                     setTimeout(() => {
                                         jMap.Locate.regionLocate(target, options);
                                     }, 500)
-
-
                                     // 分布点点击事件的回调函数
                                     function regionLocateCallBack(obj) {
                                         // that.stores.gridDataChange(obj._attributes);
                                     }
-
                                 }, idx * 1)
-                                // item.forEach(function(i) {
-                                //     arrayAll.push(i)
-                                // })
                         })
                     }
                 }, 1000)
@@ -723,12 +726,7 @@ export default {
          */
         addMarker(lnglats, pageType, type) {
             console.log(lnglats, pageType, type)
-                // if(pageType == "security-plan"){
-
-            // }else{
             window.jMap.Locate.clearLocate();
-            // }
-
             let that = this
             let icon = "";
             let arr = []
@@ -761,8 +759,10 @@ export default {
                             z: 0
                         },
                         image: {
-                            url: type == "双随机执法单位" ? this.stores.sadianIcon.ssjzf : type == "安全检查单位" ? this.stores.sadianIcon.aqjcdw : type == "举报投诉" ? this.stores.sadianIcon.jbts : type == "执法记录仪" ? this.stores.sadianIcon.zfjly :
-
+                            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 :
@@ -804,6 +804,10 @@ export default {
                                 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,
 
@@ -1127,7 +1131,7 @@ export default {
                         }
                         //大型安保 、火灾数据分析
                         if (pageType == "security-plan") {
-
+                            console.log(pageType,type)
                             // let arrayList = [{
                             //     title: ["案件详情", true],
                             //     children: [
@@ -1217,80 +1221,70 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type.indexOf(' ')!=-1) {
-                                console.log(val.attrbutes)
+                            if (type == "流动消防站（一级）") {
+                                console.log(222222222)
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
-                                    title: [type, true],
+                                    title: [val.attrbutes.facilityName, true],
                                     children: [
-                                        ["单位名称：", val.attrbutes.facilityName, 24],
-                                        // ["设施类型：", val.attrbutes.facilityType, 24],
-                                        ["地址：", val.attrbutes.address, 24],
-                                        ["所属街镇：", val.attrbutes.streetTown, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["驻防位置：", val.attrbutes.address, 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.test7} ${msgParse.test6}`, 24],
+                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type.indexOf('镇')!=-1||type.indexOf('街道')!=-1 ){
+                            if (type == "流动消防站（二级）") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
-                                    title: [type, true],
+                                    title: [val.attrbutes.facilityName, true],
                                     children: [
-                                        ["单位名称：", val.attrbutes.facilityName, 24],
-                                        // ["设施类型：", val.attrbutes.facilityType, 24],
-                                        ["地址：", val.attrbutes.address, 24],
-                                        ["所属街镇：", val.attrbutes.streetTown, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["驻防位置：", val.attrbutes.address, 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.test7} ${msgParse.test6}`, 24],
+                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "七宝镇") {
-                                alert(typeof(type))
+                            if (type == "重点微型消防站") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
-                                    title: ["七宝镇", true],
+                                    title: [val.attrbutes.facilityName, true],
                                     children: [
-                                        ["单位名称：", val.attrbutes.facilityName, 24],
-                                        // ["设施类型：", val.attrbutes.facilityType, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
                                         ["地址：", val.attrbutes.address, 24],
-                                        ["所属街镇：", val.attrbutes.streetTown, 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],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            // if (type == "华漕镇") {
-                            //     let arrayList = [{
-                            //         title: ["华漕镇", true],
-                            //         children: [
-                            //             ["单位名称：", val.attrbutes.facilityName, 24],
-                            //             // ["设施类型：", val.attrbutes.facilityType, 24],
-                            //             ["地址：", val.attrbutes.address, 24],
-                            //             ["所属街镇：", val.attrbutes.streetTown, 24],
-                            //         ],
-                            //     }, ];
-                            //     this.popup(val._attrbutes, arrayList, true)
-                            // }
-                            // if (type == "新虹街道") {
-                            //     let arrayList = [{
-                            //         title: ["新虹街道", true],
-                            //         children: [
-                            //             ["单位名称：", val.attrbutes.facilityName, 24],
-                            //             // ["设施类型：", val.attrbutes.facilityType, 24],
-                            //             ["地址：", val.attrbutes.address, 24],
-                            //             ["所属街镇：", val.attrbutes.streetTown, 24],
-                            //         ],
-                            //     }, ];
-                            //     this.popup(val._attrbutes, arrayList, true)
-                            // }
-                            // if (type == "虹桥镇") {
-                            //     let arrayList = [{
-                            //         title: ["虹桥镇", true],
-                            //         children: [
-                            //             ["单位名称：", val.attrbutes.facilityName, 24],
-                            //             // ["设施类型：", val.attrbutes.facilityType, 24],
-                            //             ["地址：", val.attrbutes.address, 24],
-                            //             ["所属街镇：", val.attrbutes.streetTown, 24],
-                            //         ],
-                            //     }, ];
-                            //     this.popup(val._attrbutes, arrayList, true)
-                            // }
                         }
                         //火灾数据分析
                         if (pageType == "fire-data-analysis") {
@@ -1490,6 +1484,134 @@ export default {
                     },
                 });
             }
+        },
+         /**
+         * 点分布（撒点四叶草 安保专用）
+         * @param {坐标信息} lnglats
+         * @param {页面类型} type
+         */
+        addMarkerSYC(lnglats, pageType, type) {
+            let that = this
+            let icon = "";
+            var target = lnglats.map((val, ind) => {
+                var wgs84 = CoordUtil.gcj02towgs84(Number(val.gisX) || Number(val.longitude), Number(val.gisY) || Number(val.latitude))
+                var x = wgs84[0]
+                var y = wgs84[1]
+                if (
+                    pageType == "security-plan") {
+                    let marker = {
+                        id: ind + 1,
+                        attrbutes: val,
+                        position: {
+                            x: x,
+                            y: y,
+                            z: 0
+                        },
+                        image: {
+                            url: type == "国家会展中心" ? this.stores.sadianIcon.hzzx : this.stores.sadianIcon.zdwxxfz,
+                            width: val.type == "国家会展中心" ? 83  : 19.5,
+                            height: val.type == "国家会展中心" ? 59 : 25,
+                        },
+                    };
+                    return marker;
+                } else {
+                    let marker = {
+                        id: ind + 1,
+                        attrbutes: val,
+                        position: { x: val.gisBaiDuX, y: val.gisBaiDuY, z: 0 },
+                        image: { url: icon, width: 300, height: 300 },
+                    };
+
+                    return marker;
+                }
+            });
+            //撒点类型
+            window.jMap.Locate.pointLocate(target, {
+                //撒点
+                isZoom: false,
+                //animate: { "show": true },
+                scaleByDistance: {
+                    minScaling: 1,
+                    maxScaling: 1,
+                    minDistance: 50, //最小距离
+                    maxDistance: 120000 //最大距离
+                },
+                click: (val) => {
+
+                },
+            });
+        },
+         /**
+         * 点分布（网格名称 安保专用）
+         * @param {坐标信息} lnglats
+         * @param {页面类型} type
+         */
+         addMarkerWG(lnglats, pageType, type) {
+            console.log(1111,lnglats, pageType, type)
+            let that = this
+            let icon = "";
+            var target = lnglats.map((val, ind) => {
+                var wgs84 = CoordUtil.gcj02towgs84(Number(val.gisX) || Number(val.longitude), Number(val.gisY) || Number(val.latitude))
+                var x = wgs84[0]
+                var y = wgs84[1]
+                if (
+                    pageType == "security-plan") {
+                        console.log(val.type)
+                    let marker = {
+                        id: ind + 1,
+                        attrbutes: val,
+                        position: {
+                            x: x,
+                            y: y,
+                            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" ? 35 :  
+                            val.type == "wgmc_xh" ? 35 :  
+                            val.type == "wgmc_qb" ? 35 :  
+                            val.type == "wgmc_hq" ? 35 :  
+                            val.type == "国家会展中心" ? 59 : 25,
+                        },
+                    };
+                    return marker;
+                } else {
+                    let marker = {
+                        id: ind + 1,
+                        attrbutes: val,
+                        position: { x: val.gisBaiDuX, y: val.gisBaiDuY, z: 0 },
+                        image: { url: icon, width: 300, height: 300 },
+                    };
+
+                    return marker;
+                }
+            });
+            //撒点类型
+            window.jMap.Locate.pointLocate(target, {
+                //撒点
+                isZoom: false,
+                //animate: { "show": true },
+                scaleByDistance: {
+                    minScaling: 1,
+                    maxScaling: 1,
+                    minDistance: 50, //最小距离
+                    maxDistance: 120000 //最大距离
+                },
+                click: (val) => {
+
+                },
+            });
         },
         //聚合点击事件
         clusterMapCallBack(clusterPointArr, clickPoint) {
@@ -1912,7 +2034,6 @@ export default {
                     }
                     for (let i = 0; i < arrayList[0].children.length; i++) {
                         if (arrayList[0].children[i][1]) {
-
                             let textWrap = document.createElement('div');
                             textWrap.setAttribute('style', 'font-size:14px;color:#fff;line-height:25px;');
                             let p1 = document.createElement('span');

src/store/modules/public.js

@@ -83,11 +83,21 @@ const useStore = defineStore("public", {
             ywc: require("@a/img/sadian/ywc.png"), //已完成
             jxz: require("@a/img/sadian/jxz.png"), //进行中
             zbz: require("@a/img/sadian/zbz.png"), //招标中
-            gfx: require("@a/img/sadian/gfx.png"), //招标中
-            jgfx: require("@a/img/sadian/jgfx.png"), //招标中
-            ybfx: require("@a/img/sadian/ybfx.png"), //招标中
-            dfx: require("@a/img/sadian/dfx.png"), //招标中
-            dwxj: require("@a/img/sadian/dwxj.png"), //招标中
+            gfx: require("@a/img/sadian/gfx.png"), //高风险
+            jgfx: require("@a/img/sadian/jgfx.png"), //较高风险
+            ybfx: require("@a/img/sadian/ybfx.png"), //一般风险
+            dfx: require("@a/img/sadian/dfx.png"), //低风险
+            dwxj: require("@a/img/sadian/dwxj.png"), //单位巡检
+            ldxfzyj: require("@a/img/sadian/ldxfzyj.png"), //流动消防站（一级）
+            ldxfzej: require("@a/img/sadian/ldxfzej.png"), //流动消防站（二级）
+            zdwxxfz: require("@a/img/sadian/zdwxxfz.png"), //重点微型消防站
+            d: require("@a/img/sadian/d.png"), //大网格
+            z: require("@a/img/sadian/z.png"), //中网格
+            x: require("@a/img/sadian/x.png"), //小网格
+            wgmc_hc: require("@a/img/sadian/wgmc_hc.png"), //大网格-华漕名称
+            wgmc_xh: require("@a/img/sadian/wgmc_xh.png"), //大网格-新虹名称
+            wgmc_qb: require("@a/img/sadian/wgmc_qb.png"), //大网格-七宝名称
+            wgmc_hq: require("@a/img/sadian/wgmc_hq.png"), //大网格-虹桥名称
 
         },
 

src/views/security-plan.vue

@@ -336,15 +336,15 @@
                                 </el-select>
                             </div>
                             <div @click="checkboxChange(19)" :class="checkedArray.checkedData[0] == 19 ? 'checkTypeSelect' : ''">
-                                <img :src="stores.sadianIcon.zddw" alt="" />
+                                <img :src="stores.sadianIcon.d" alt="" />
                                 <span>大网格</span>
                             </div>
                             <div @click="checkboxChange(15)" :class="checkedArray.checkedData[0] == 15 ? 'checkTypeSelect' : ''">
-                                <img :src="stores.sadianIcon.zddw" alt="" />
+                                <img :src="stores.sadianIcon.z" alt="" />
                                 <span>中网格</span>
                             </div>
                             <div @click="checkboxChange(16)" :class="checkedArray.checkedData[0] == 16 ? 'checkTypeSelect' : ''">
-                                <img :src="stores.sadianIcon.zddw" alt="" />
+                                <img :src="stores.sadianIcon.x" alt="" />
                                 <span>小网格</span>
                             </div>
                             <div @click="checkboxChange(17)" :class="checkedArray.checkedData[0] == 17 ? 'checkTypeSelect' : ''">
@@ -355,6 +355,11 @@
                                 <img :src="stores.sadianIcon.jdjc" alt="" />
                                 <span>监督检查</span>
                             </div>
+                            <div @click="checkboxChange(20)" :class="checkedArray.checkedData[0] == 20 ? 'checkTypeSelect' : ''">
+                                <img :src="stores.sadianIcon.zfjly" alt="" />
+                                <span>执法记录仪</span>
+                            </div>
+                            
                         </div>
                     </div>
                 </div>
@@ -432,7 +437,7 @@
                             <div >处置率<br>100%</div>
                         </div>
                         <div class="row_g">
-                            <div >累计:</div>
+                            <div >今日:</div>
                             <div >0（起）</div>
                             <div >0（起）</div>
                             <div >0（起）</div>
@@ -764,7 +769,7 @@
                             </div>
                         </el-col>
                     </el-row> -->
-                    <h4>疏导区执法及监控视频画面</h4>
+                    <h4>疏导区执法记录仪画面</h4>
                     <el-row class="monitor-list" >
                         <div class="list">
                             <el-select
@@ -787,6 +792,9 @@
                                 :src="zfjly1"
                                 allowfullscreen="true"
                             ></iframe>
+                            <div @click="videoClose(1)" class="videoCloseBtn" v-if="zfjly1">
+                                <div class="returnText">关闭</div>
+                            </div>
                         </div>
                         <div class="list" :offset="2">
                             <el-select
@@ -808,6 +816,9 @@
                                 :src="zfjly2"
                                 allowfullscreen="true"
                             ></iframe>
+                            <div @click="videoClose(2)" class="videoCloseBtn" v-if="zfjly2">
+                                <div class="returnText">关闭</div>
+                            </div>
                         </div>
                     </el-row>
                 </div>
@@ -1122,19 +1133,19 @@ export default {
                     "streetTown": "消防站",
                     "count": 4,
                     "color": "#FF0709",
-                    "facilityType":33
+                    "facilityType":30
                 },
                 {
                     "streetTown": "流动消防站（一级）",
                     "count": 5,
                     "color": "#F48354",
-                    "facilityType":34
+                    "facilityType":33
                 },
                 {
                     "streetTown": "流动消防站（二级）",
                     "count": 5,
                     "color": "#73FBFD",
-                    "facilityType":35
+                    "facilityType":34
                 },
                 {
                     "streetTown": "重点微型消防站",
@@ -1221,8 +1232,7 @@ export default {
                     { value: 16, label: "小网格" },
                     { value: 17, label: "监控视频" },
                     { value: 18, label: "监督检查" },
-                    
-                    
+                    { value: 20, label: "执法记录仪" },
                 ],
             }, //类型筛选
             checkedSelectValue: "40",
@@ -1499,26 +1509,87 @@ export default {
         };
     },
     mounted() {
-
-
         this.gridStatisticsData()//处置网格数据
-        this.surveillance()//监控视频
         this.grid(15);
         setTimeout(() => {
             this.autoScroll();
         });
         window.addEventListener("resize", () => this.resizeTimeActions([this.$refs.category, this.$refs.gauge1]), true);
         this.initMap("anbao"); //地图初始化
-        this.anbao(null, 3);
-        this.anbaoMap()
+        this.anbao(null, 3);//大网格
+        this.dwgjcmcAndhzzx()//大网格名称及会展中心 
+        // this.anbaoMap()
         this.getFireSiteDuty(); //各站点执勤实力
         this.selectVideo(); //视频在线
         // this.sadianSelect(this.checkedArray.checkedData[0]);  //撒点
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
         // this.llbutj()//力量部署统计
+
+        
     },
     methods: {
+        /**
+         * 视频关闭
+         * @param {} id 
+         */
+        videoClose(id){
+            if(id ==1){
+                this.zfjly1 = true
+            }
+            if(id ==2){
+                this.zfjly2 = true
+            }
+            this.destroyHls()
+        },
+        /**
+         * 大网格街镇名称
+         */
+         dwgjcmcAndhzzx(){
+            setTimeout(()=>{
+                let data = [
+                    {
+                        gisX: 121.271655,
+                        gisY: 31.227993,
+                        type: "wgmc_hc",
+                    },
+                    {
+                        gisX: 121.308632,
+                        gisY: 31.201660,
+                        type: "wgmc_xh",
+                    },
+                    {
+                        gisX: 121.326266,
+                        gisY: 31.165491,
+                        type: "wgmc_qb",
+                    },
+                    {
+                        gisX: 121.379764,
+                        gisY: 31.186605,
+                        type: "wgmc_hq",
+                    },
+                    {
+                        gisX: 121.302183,
+                        gisY: 31.189991,
+                        type: "国家会展中心",
+                    }
+                ];
+                this.addMarkerWG(data, "security-plan", "大网格街镇名称&国家会展中心")
+            },2000)
+        },
+        /**
+         * 会展中心图标（）特殊处理
+         */
+        hzzxtb(){
+            setTimeout(()=>{
+                let data = {
+                    gisX: 121.302183,
+                    gisY: 31.189991,
+                    type: "国家会展中心",
+                };
+                this.addMarkerSYC([data], "security-plan", "国家会展中心")
+            },2000)
+        },
         /**
          * 力量部署统计
          */
@@ -1562,12 +1633,12 @@ export default {
                                         arr = res.data;
                                         this.arrayData= res.data;
                                         
-                                        if(type=='33'){
+                                        if(type=='30'){
                                             this.addMarker(arr, "security-plan", "消防站")
-                                        }else if(type=='34'){
+                                        }else if(type=='33'){
                                             this.addMarker(arr, "security-plan", "流动消防站（一级）")
-                                        }else if(type=='35'){
-                                            this.addMarker(arr, "security-plan", "医流动消防站（二级）")
+                                        }else if(type=='34'){
+                                            this.addMarker(arr, "security-plan", "流动消防站（二级）")
                                         }else if(type=='36'){
                                             this.addMarker(arr, "security-plan", "重点微型消防站")
                                         }
@@ -1880,6 +1951,12 @@ export default {
                     }
                     this.selectVideoData = zfjly;
                     if (arr.length > 0 && id) {
+                        let data = {
+                            gisX: 121.302183,
+                            gisY: 31.189991,
+                            type: "国家会展中心",
+                        };
+                        arr.push(data)
                         this.addMarker(arr, "enforcement-dynamic","执法记录仪");
                     }
                 }
@@ -2019,21 +2096,33 @@ export default {
             if (id == 15) {
                 this.gridStatus = id;
                 this.anbao(1, 1);
-                this.anbaoMap()
+                // this.anbaoMap()
                 this.grid(id);
+                this.hzzxtb()
             } else if (id == 16) {
                 this.gridStatus = id;
                 this.grid(16, null, null, 1);
-                this.anbaoMap()
-                this.anbao(1, 2);
+                // this.anbaoMap()
+                // this.anbao(1, 2);
+                this.hzzxtb()
             } else if (id == 17) {
                 this.surveillance()
+                this.hzzxtb()
             } else if (id == 18) {
+                this.gridStatus = id;
+                this.sadianSelect(id);
+                this.hzzxtb()
+            } else if (id == 19) {
                 this.gridStatus = id;
                 this.anbao(1, 3);
-                this.anbaoMap()
+                this.dwgjcmcAndhzzx()
+            } else if (id == 20) {
+                this.gridStatus = id;
+                this.selectVideo(1)
+                
             } else {
                 this.sadianSelect(id);
+                this.hzzxtb()
             }
         },
         /* 历史警情 */
@@ -2305,7 +2394,6 @@ export default {
                         this.$axios
                         .get(this.$api.fire.fireSafetyInspectionScatter)
                         .then((res) => {
-                            console.log(123,res)
                             for(let i =0;i<res.data.length;i++){
                                 res.data[i].type = "监督检查"
                                 arr.push(res.data[i])
@@ -2447,7 +2535,7 @@ export default {
                         arr.name = area;
                         arr.position = position;
                         arr.content = gridData;
-                        this.anbaoPopup(arr);
+                        // this.anbaoPopup(arr);
                         this.superiorGrid(gridData[0].seniorGrid, id == 15 ? 1 : id == 16 ? 2 : "");
                     } else {
                     }
@@ -3147,7 +3235,7 @@ export default {
             }
         }
         .rightTop1{
-            height:70.5%;
+            height:75.5%;
             .girdCheckItem{
                 p{
                     font-size:0.225rem;
@@ -3161,7 +3249,7 @@ export default {
                     }
                 }
                 .row_g{
-                    margin-top:-10px;
+                    margin-top:10px;
                     width:100%;
                     div{
                         width:14% !important;
@@ -3170,6 +3258,7 @@ export default {
                         margin:.125rem 0;
                         text-align: left;
                         vertical-align: top;
+                        
                     }
                 }
                 .row_g2{
@@ -3182,7 +3271,6 @@ export default {
                         margin:.125rem 0;
                         text-align: left;
                         vertical-align: top;
-                        text-align: center;
                     }
                 }
                 .row_g3{
@@ -3195,7 +3283,6 @@ export default {
                         margin:.125rem 0;
                         text-align: left;
                         vertical-align: top;
-                        text-align: center;
                     }
                 }
                     
@@ -3248,7 +3335,7 @@ export default {
             border: 1px solid #3a7e8e;
             position: relative;
             width:48%;
-            height:21vh;
+            height:16.5vh;
             box-sizing: border-box;
             .videoSelect {
                 position: absolute;
@@ -3320,6 +3407,25 @@ export default {
     }
   }
 }
+.videoCloseBtn{
+        position: absolute;
+        z-index: 10;
+        bottom:0;
+        left:0;
+        cursor: pointer;
+        .returnText{
+            width: 0.5rem;
+            text-align: center;
+            height: 0.3rem;
+            line-height: 0.3rem;
+            box-shadow: inset 0 0 0.05rem 0.05rem #1b4f90;
+            background: rgba(19, 42, 90, 0.2) !important;
+            color: #fff;
+            float: right;
+            margin-top: 0;
+
+        }
+    }
 </style>
 <style>
 .el-tooltip__popper {