Pārlūkot izejas kodu

调整完成了

13127578837 1 gadu atpakaļ
vecāks
revīzija
07706a37f0

BIN
src/assets/img/sadian/cfck.png


BIN
src/assets/img/sadian/dfx.png


BIN
src/assets/img/sadian/dtz.png


BIN
src/assets/img/sadian/etfljg.png


BIN
src/assets/img/sadian/gfx.png


BIN
src/assets/img/sadian/gmzl.png


BIN
src/assets/img/sadian/jdbg.png


BIN
src/assets/img/sadian/jgfx.png


BIN
src/assets/img/sadian/jmxq.png


BIN
src/assets/img/sadian/pfsc.png


BIN
src/assets/img/sadian/ybfx.png


BIN
src/assets/img/sadian/yjmm.png


BIN
src/assets/img/sadian/yljg2.png


+ 352 - 191
src/components/mixins/map-data1.js

@@ -109,7 +109,7 @@ export default {
          */
         anbaoSDUWG() {
 
-            // arr["疏导区","核心区","新虹","虹桥","七宝","疏导区","疏导区","疏导区","疏导区","疏导区","疏导区"]
+            // arr["疏导区","核心区","新虹","虹桥","七宝"]
             let arr = [
                     [
                         { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
@@ -258,7 +258,7 @@ export default {
                 //     console.log(111, arr)
             for (let i = 0; i < arr.length; i++) {
                 let target = {
-                    id: i,
+                    id: i + 99999,
                     attributes: {
                         name: i,
                     },
@@ -294,7 +294,7 @@ export default {
          * 疏导区网格
          */
         anbaoSDUWG2() {
-            // arr["疏导区","核心区","新虹","虹桥","七宝","疏导区","疏导区","疏导区","疏导区","疏导区","疏导区"]
+            // arr["疏导区","核心区","新虹","虹桥","七宝"]
             let arr = [
                     [
                         { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
@@ -1378,15 +1378,14 @@ export default {
 
                 ]
                 //高德转84
-                    let sz = [
-                        [121.243376,31.247862],[121.240361,31.240635],[121.247706,31.241094],[121.248819,31.237274],[121.249632,31.236539],[121.25109,31.238175],[121.253001,31.236864],[121.254,31.233049],[121.257463,31.230541],[121.258075,31.226999],[121.256486,31.226345],[121.258333,31.22193],[121.257506,31.220133],[121.261227,31.215027],[121.259437,31.212694],[121.26387,31.208689],[121.264992,31.206371],[121.262936,31.205372],[121.264802,31.203361],[121.266702,31.203244],[121.277339,31.193551],[121.286002,31.19548],[121.290979,31.199333],[121.292473,31.202491],[121.294694,31.203094],[121.298386,31.200446],[121.301417,31.196276],[121.30451,31.196323],[121.303043,31.207259],[121.302449,31.218303],[121.307232,31.217926],[121.311008,31.217933],[121.319189,31.221494],[121.324708,31.22214],[121.326242,31.222502],[121.327699,31.222444],[121.330307,31.223255],[121.335611,31.223961],[121.338201,31.224053],[121.340918,31.224104],[121.341878,31.225831],[121.345007,31.229049],[121.34354,31.234449],[121.340347,31.238533],[121.337691,31.237325],[121.334506,31.235437],[121.334319,31.232125],[121.324777,31.229453],[121.315737,31.227262],[121.297126,31.231016],[121.292431,31.232929],[121.2881,31.238916],[121.287031,31.243827],[121.281345,31.248059],[121.284311,31.251841],[121.275355,31.25351],[121.271092,31.25239],[121.269767,31.253539],[121.26261,31.257248],[121.25585,31.259069],[121.254586,31.259225],[121.254247,31.258653],[121.254382,31.25816],[121.253907,31.257755],[121.253506,31.257458],[121.252784,31.257216],[121.251848,31.256628],[121.251039,31.256543],[121.250756,31.256016],[121.250154,31.256142],[121.248646,31.254901],[121.247393,31.252997],[121.246186,31.251093]                    ]
-                    let result = {}
-                    let bb=[]
-                    for (let i = 0; i < sz.length; i++) {
-                        result = CoordUtil.gcj02towgs84(sz[i][0], sz[i][1]);
-                        bb.push({ x: result[0], y: result[1], z: 0 })
-                    }
-                    console.log(111, bb)
+                    // let sz = [
+                    //     [121.243376,31.247862],[121.240361,31.240635],[121.247706,31.241094],[121.248819,31.237274],[121.249632,31.236539],[121.25109,31.238175],[121.253001,31.236864],[121.254,31.233049],[121.257463,31.230541],[121.258075,31.226999],[121.256486,31.226345],[121.258333,31.22193],[121.257506,31.220133],[121.261227,31.215027],[121.259437,31.212694],[121.26387,31.208689],[121.264992,31.206371],[121.262936,31.205372],[121.264802,31.203361],[121.266702,31.203244],[121.277339,31.193551],[121.286002,31.19548],[121.290979,31.199333],[121.292473,31.202491],[121.294694,31.203094],[121.298386,31.200446],[121.301417,31.196276],[121.30451,31.196323],[121.303043,31.207259],[121.302449,31.218303],[121.307232,31.217926],[121.311008,31.217933],[121.319189,31.221494],[121.324708,31.22214],[121.326242,31.222502],[121.327699,31.222444],[121.330307,31.223255],[121.335611,31.223961],[121.338201,31.224053],[121.340918,31.224104],[121.341878,31.225831],[121.345007,31.229049],[121.34354,31.234449],[121.340347,31.238533],[121.337691,31.237325],[121.334506,31.235437],[121.334319,31.232125],[121.324777,31.229453],[121.315737,31.227262],[121.297126,31.231016],[121.292431,31.232929],[121.2881,31.238916],[121.287031,31.243827],[121.281345,31.248059],[121.284311,31.251841],[121.275355,31.25351],[121.271092,31.25239],[121.269767,31.253539],[121.26261,31.257248],[121.25585,31.259069],[121.254586,31.259225],[121.254247,31.258653],[121.254382,31.25816],[121.253907,31.257755],[121.253506,31.257458],[121.252784,31.257216],[121.251848,31.256628],[121.251039,31.256543],[121.250756,31.256016],[121.250154,31.256142],[121.248646,31.254901],[121.247393,31.252997],[121.246186,31.251093]                    ]
+                    // let result = {}
+                    // let bb=[]
+                    // for (let i = 0; i < sz.length; i++) {
+                    //     result = CoordUtil.gcj02towgs84(sz[i][0], sz[i][1]);
+                    //     bb.push({ x: result[0], y: result[1], z: 0 })
+                    // }
             for (let i = 0; i < arr.length; i++) {
                 let target = {
                     id: i,
@@ -1406,7 +1405,7 @@ export default {
                 let options = {
                     isZoom: false,
                     style: {
-                        color: i == 0 ? "red" : i == 1 ? "" : "",
+                        color: i == 0 ? "red" : "rgb(1, 224, 255)",
                         transparency: 1,
                         outline: true,
                         outlineColor: 'transparent',
@@ -1626,7 +1625,6 @@ export default {
 
                                 // 分布点点击事件的回调函数
                                 function regionLocateCallBack(obj) {
-                                    console.log(obj)
                                     that.stores.gridDataChange(obj._attributes);
                                     that.stores.gridDataChange1(obj._id);
                                 }
@@ -1648,7 +1646,7 @@ export default {
                 }
 
                 // queryName = queryName + ",'涞港星苑筹备组','爱博四村居委','爱博五村居委','爱博二村居委','爱博一村居委','爱博三村居委','万科润园居委','华美路一居委','华美路二居委','沙茂居委','航华一村2居委','航华一村5居委','航华一村7居委','航华一村6居委'"
-                console.log(queryName)
+                // console.log(queryName)
                 setTimeout(() => {
                     var name2 = [];
                     var qp3 = new JMapQueryParam({
@@ -1661,14 +1659,13 @@ export default {
                         //     ) 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 = []
                         for (let i = 0; i < obj.features.length; i++) {
                             a[i] = {
@@ -1777,6 +1774,8 @@ export default {
                                         }, 500)
                                         // 分布点点击事件的回调函数
                                     function regionLocateCallBack2(obj) {
+                                        // that.stores.gridDataChange(obj._attributes);
+                                        // that.stores.gridDataChange1(obj._id);
                                         that.stores.gridDataChange(obj._attributes);
                                     }
 
@@ -1915,8 +1914,9 @@ export default {
             if (data.type == 16) {
                 children = [
                     ["街道:", data.content[0].streetTown, 12],
-                    ["小网格人员:", data.content[0].type1, 12],
                     ["小网格长:", data.content[0].type2, 12],
+                    ["小网格人员:", data.content[0].type1, 12],
+                    
                 ]
             }
             let arrayList = [{
@@ -2130,6 +2130,15 @@ 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 :
 
+                                type == "新消监" & val.facilityType == 39 ?  this.stores.sadianIcon.jxcs : type == "新消监" & val.facilityType == 42 ?  this.stores.sadianIcon.jdjc :
+
+                                type == "消防安全重点单位" ? this.stores.sadianIcon.zddw : type == "大型商业综合体" ? this.stores.sadianIcon.dxsyzht : 
+
+                                type == "酒店/宾馆" ? this.stores.sadianIcon.jdbg : type == "规模租赁" ? this.stores.sadianIcon.gmzl : 
+                                type == "厂房/仓库" ? this.stores.sadianIcon.cfck : type == "养老机构" ? this.stores.sadianIcon.yljg : 
+                                type == "儿童福利机构" ? this.stores.sadianIcon.etfljg : type == "医疗机构" ? this.stores.sadianIcon.yljg2 : 
+                                type == "居民小区" ? this.stores.sadianIcon.jmxq : type == "地铁站" ? this.stores.sadianIcon.dtz : 
+                                type == "批发市场" ? this.stores.sadianIcon.pfsc :
 
                                 this.stores.sadianIcon.trsy,
 
@@ -2375,7 +2384,6 @@ export default {
                         //企业自主
                         if (pageType == "self-management") {
                             if (val.attrbutes.type == "重点单位") {
-                                console.log(111111111111111111)
                                     // this.elementInfo(val.attrbutes, "重点单位")
                                 that.stores.zddwIdSD(val.attrbutes.companyId);
                             } else if (val.attrbutes.type == "大型综合体") {
@@ -2499,6 +2507,10 @@ export default {
                                         ["单位名称:", val.attrbutes.facilityName, 24],
                                         ["地址:", val.attrbutes.address, 24],
                                         ["所属街镇:", val.attrbutes.streetTown, 24],
+                                        ["联系人:", val.attrbutes.contact, 24],
+                                        ["联系电话:", val.attrbutes.contactPhone, 24],
+                                        ["床位数:", msgParse.test1, 24],
+                                        ["重点单位:", msgParse.test2, 24],
                                         // ["隐患问题:", msgParse.test1, 24],
                                     ],
                                 }, ];
@@ -2511,9 +2523,11 @@ export default {
                                     children: [
                                         ["单位名称:", val.attrbutes.facilityName, 24],
                                         ["地址:", val.attrbutes.address, 24],
+                                        ["联系人:", val.attrbutes.contact, 24],
+                                        ["联系电话:", val.attrbutes.contactPhone, 24],
                                         ["所属街镇:", val.attrbutes.streetTown, 24],
-                                        ["描述:", msgParse.test1, 24],
-                                        // ["隐患问题:", msgParse.test2, 24],
+                                        ["床位数:", msgParse.test1, 24],
+                                        ["重点单位:", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -2521,7 +2535,7 @@ export default {
                             if (type == "流动消防站(一级)") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
-                                    title: [val.attrbutes.facilityName, true],
+                                    title: [type, true],
                                     children: [
                                         ["街镇:", val.attrbutes.streetTown, 24],
                                         ["驻防位置:", val.attrbutes.address, 24],
@@ -2535,23 +2549,23 @@ 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 ) ? `${msgParse.test10} ${msgParse.test9}` : "", 24],
+                                        ["跟车人员姓名及岗位2:", (msgParse.test12 || msgParse.test11 ) ? `${msgParse.test12} ${msgParse.test11}` : "", 24],
+                                        ["跟车人员姓名及岗位3:", (msgParse.test14 || msgParse.test13 ) ? `${msgParse.test14} ${msgParse.test13}` : "", 24],
+                                        ["跟车人员姓名及岗位4:", (msgParse.test16 || msgParse.test15 ) ? `${msgParse.test16} ${msgParse.test15}` : "", 24],
+                                        ["跟车人员姓名及岗位5:", (msgParse.test18 || msgParse.test17 ) ? `${msgParse.test18} ${msgParse.test17}` : "", 24],
+                                        ["跟车人员姓名及岗位6:", (msgParse.test20 || msgParse.test19 ) ? `${msgParse.test20} ${msgParse.test19}` : "", 24],
+                                        ["跟车人员姓名及岗位7:", (msgParse.test22 || msgParse.test21 ) ? `${msgParse.test22} ${msgParse.test21}` : "", 24],
                                         ["户号:", msgParse.test23, 24],
                                         ["车型:", msgParse.test24, 24],
                                         ["车辆号牌:", msgParse.test25, 24],
                                         ["所属单位:", msgParse.test26, 24],
                                         ["电台呼号:", msgParse.test27, 24],
-                                        ["车辆类型:", `${msgParse.test28} ${msgParse.test29} ${msgParse.test30} ${msgParse.test31} ${msgParse.test32}`, 24],
+                                        ["车辆类型:", (msgParse.test28 || msgParse.test29 || msgParse.test30 || msgParse.test31 || msgParse.test32) ? `${msgParse.test28} ${msgParse.test29} ${msgParse.test30} ${msgParse.test31} ${msgParse.test32}` : "", 24],
                                         ["总质量:", msgParse.test33, 24],
                                         ["乘员数:", msgParse.test34, 24],
 
-                                        ["云梯高度(米)、油箱容量(升):", `${msgParse.test35} 、${msgParse.test36}`, 24],
+                                        ["云梯高度(米)、油箱容量(升):", (msgParse.test35 || msgParse.test3) ? `${msgParse.test35} 、${msgParse.test36}` : '', 24],
                                         ["发动机功率(千瓦):", msgParse.test37, 24],
                                         ["水泵流量(升/分钟):", msgParse.test38, 24],
 
@@ -2569,7 +2583,7 @@ export default {
                             if (type == "流动消防站(二级)") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
-                                    title: [val.attrbutes.facilityName, true],
+                                    title: [type, true],
                                     children: [
                                         ["街镇:", val.attrbutes.streetTown, 24],
                                         ["驻防位置:", val.attrbutes.address, 24],
@@ -2581,8 +2595,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) ? `${msgParse.test7} ${msgParse.test6}` : "", 24],
+                                        ["跟车人员姓名及岗位:", (msgParse.test9 || msgParse.test8) ? `${msgParse.test9} ${msgParse.test8}` : "", 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -2615,11 +2629,25 @@ export default {
                                         ["宾馆酒店名称:", val.attrbutes.facilityName, 24],
                                         ["街镇:", val.attrbutes.streetTown, 24],
                                         ["地址:", val.attrbutes.address, 24],
+                                        ["联系人:", val.attrbutes.contact, 24],
+                                        ["联系电话:", val.attrbutes.contactPhone, 24],
                                         ["房间数:", msgParse.test1, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            if (type == "地铁站") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["地铁站名称:", val.attrbutes.facilityName, 24],
+                                        ["街镇:", val.attrbutes.streetTown, 24],
+                                        ["描述:", msgParse.test1, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
                             if (type == "大型商业综合体") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
@@ -2720,163 +2748,295 @@ export default {
                             //     }
                             //疏导区单位情况----------------------
                             //四色分级
-                            if (type == "高风险" || type == "较高风险" || type == "一般风险" || type == "低风险") {
-                                if (val.attrbutes.extendData) {
-                                    let msgParse = JSON.parse(val.attrbutes.extendData)
+                            if (type == "高风险" || type == "较高风险" || type == "一般风险" || type == "低风险" || type == "新消监" && val.attrbutes.facilityType == 39 ) {
                                         //九小场所
                                     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],
-
-                                                ["隐患问题:", msgParse.test10=='有此类问题'?'存在灭火器材未保持完的情况':'', 12],
-                                                ["具体情形:", msgParse.test10=='有此类问题'? msgParse.test11:'', 12],
-                                                ["整改情况:", msgParse.test10=='有此类问题'? msgParse.test12:'', 12],
-                                                ["隐患问题:", msgParse.test13=='有此类问题'?'存在违规住人“三合一”行为':'', 12],
-                                                ["具体情形:", msgParse.test13=='有此类问题'? msgParse.test14:'', 12],
-                                                ["整改情况:", msgParse.test13=='有此类问题'? msgParse.test15:'', 12],
-                                                ["隐患问题:", msgParse.test16=='有此类问题'?'存在违规使用明火、电焊或私拉乱接电线 的行为':'', 12],
-                                                ["具体情形:", msgParse.test16=='有此类问题'? msgParse.test17:'', 12],
-                                                ["整改情况:", msgParse.test16=='有此类问题'? msgParse.test18:'', 12],
-                                                ["隐患问题:", msgParse.test19=='有此类问题'?'存在应急照明、疏散指示标志损坏或缺失的行为':'', 12],
-                                                ["具体情形:", msgParse.test19=='有此类问题'? msgParse.test20:'', 12],
-                                                ["整改情况:", msgParse.test19=='有此类问题'? msgParse.test21:'', 12],
-                                                ["隐患问题:", msgParse.test22=='有此类问题'?'存在违规占用疏散通道、安全出口的行为':'', 12],
-                                                ["具体情形:", msgParse.test22=='有此类问题'? msgParse.test23:'', 12],
-                                                ["整改情况:", msgParse.test22=='有此类问题'? msgParse.test24:'', 12],
-                                                ["隐患问题:", msgParse.test25=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
-                                                ["具体情形:", msgParse.test25=='有此类问题'? msgParse.test26:'', 12],
-                                                ["整改情况:", msgParse.test25=='有此类问题'? msgParse.test27:'', 12],
-                                                ["隐患问题:", msgParse.test28=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
-                                                ["具体情形:", msgParse.test28=='有此类问题'? msgParse.test29:'', 12],
-                                                ["整改情况:", msgParse.test28=='有此类问题'? msgParse.test30:'', 12],
-                                                ["隐患问题:", msgParse.test31=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
-                                                ["具体情形:", msgParse.test31=='有此类问题'? msgParse.test32:'', 12],
-                                                ["整改情况:", msgParse.test31=='有此类问题'? msgParse.test33:'', 12],
-                                                ["隐患问题:", msgParse.test34=='有此类问题'?'存在消防设施未保持完好有效的行为':'', 12],
-                                                ["具体情形:", msgParse.test34=='有此类问题'? msgParse.test35:'', 12],
-                                                ["整改情况:", msgParse.test34=='有此类问题'? msgParse.test36:'', 12],
-                                                ["隐患问题:", msgParse.test37=='有此类问题'?'存在违规设置影响逃生和灭火救援的障碍物':'', 12],
-                                                ["具体情形:", msgParse.test37=='有此类问题'? msgParse.test38:'', 12],
-                                                ["整改情况:", msgParse.test37=='有此类问题'? msgParse.test39:'', 12],
-                                                ["隐患问题:", msgParse.test40=='有此类问题'?'存在疏散通道、安全出口数量设置不符合要求的行为':'', 12],
-                                                ["具体情形:", msgParse.test40=='有此类问题'? msgParse.test41:'', 12],
-                                                ["整改情况:", msgParse.test40=='有此类问题'? msgParse.test42:'', 12],
-                                                ["隐患问题:", msgParse.test43=='有此类问题'?'存在火灾报警系统未保持完好有效的行为':'', 12],
-                                                ["具体情形:", msgParse.test43=='有此类问题'? msgParse.test44:'', 12],
-                                                ["整改情况:", msgParse.test43=='有此类问题'? msgParse.test45:'', 12],
-                                                ["隐患问题:", msgParse.test46=='有此类问题'?'存在擅自停用消防设施的违法行为':'', 12],
-                                                ["具体情形:", msgParse.test46=='有此类问题'? msgParse.test47:'', 12],
-                                                ["整改情况:", msgParse.test46=='有此类问题'? msgParse.test48:'', 12],
-                                                ["隐患问题:", msgParse.test49=='有此类问题'?'存在火灾报警联动控制系统未保持有效的行为':'', 12],
-                                                ["具体情形:", msgParse.test49=='有此类问题'? msgParse.test50:'', 12],
-                                                ["整改情况:", msgParse.test49=='有此类问题'? msgParse.test51:'', 12],
-                                                ["隐患问题:", msgParse.test52=='有此类问题'?'存在违规使用可燃材料装修的行为':'', 12],
-                                                ["具体情形:", msgParse.test52=='有此类问题'? msgParse.test53:'', 12],
-                                                ["整改情况:", msgParse.test52=='有此类问题'? msgParse.test54:'', 12],
-                                                ["隐患问题:", msgParse.test55=='有此类问题'?'存在违规使用可燃材料搭建临时建筑的行为':'', 12],
-                                                ["具体情形:", msgParse.test55=='有此类问题'? msgParse.test56:'', 12],
-                                                ["整改情况:", msgParse.test55=='有此类问题'? msgParse.test57:'', 12],
-                                                ["隐患问题:", msgParse.test58=='有此类问题'?'存在未按规范设置防火分隔的行为':'', 12],
-                                                ["具体情形:", msgParse.test58=='有此类问题'? msgParse.test59:'', 12],
-                                                ["整改情况:", msgParse.test58=='有此类问题'? msgParse.test60:'', 12],
-                                                ["隐患问题:", msgParse.test61=='有此类问题'?'存在防火隔墙、防火卷帘、防火门等防火分隔设施损坏或缺失的行为':'', 12],
-                                                ["具体情形:", msgParse.test61=='有此类问题'? msgParse.test62:'', 12],
-                                                ["整改情况:", msgParse.test61=='有此类问题'? msgParse.test63:'', 12],
-                                                ["隐患问题:", msgParse.test64=='有此类问题'?'存在常闭式防火门未保持常闭状态的行为':'', 12],
-                                                ["具体情形:", msgParse.test64=='有此类问题'? msgParse.test65:'', 12],
-                                                ["整改情况:", msgParse.test64=='有此类问题'? msgParse.test66:'', 12],
-                                                ["隐患问题:", msgParse.test67=='有此类问题'?'存在未按规范要求做好防火封堵的行为':'', 12],
-                                                ["具体情形:", msgParse.test67=='有此类问题'? msgParse.test68:'', 12],
-                                                ["整改情况:", msgParse.test67=='有此类问题'? msgParse.test69:'', 12],
-                                                ["隐患问题:", msgParse.test70=='有此类问题'?'存在违规使用、储存易燃易爆危险品的行为':'', 12],
-                                                ["具体情形:", msgParse.test70=='有此类问题'? msgParse.test71:'', 12],
-                                                ["整改情况:", msgParse.test70=='有此类问题'? msgParse.test72:'', 12],
-                                                ["隐患问题:", msgParse.test73=='有此类问题'?'存在公共娱乐场所违规使用可燃材料装修的行为':'', 12],
-                                                ["具体情形:", msgParse.test73=='有此类问题'? msgParse.test74:'', 12],
-                                                ["整改情况:", msgParse.test73=='有此类问题'? msgParse.test75:'', 12],
-                                                ["隐患问题:", msgParse.test76=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
-                                                ["具体情形:", msgParse.test76=='有此类问题'? msgParse.test77:'', 12],
-                                                ["整改情况:", msgParse.test76=='有此类问题'? msgParse.test78:'', 12],
-                                                ["隐患问题:", msgParse.test79=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
-                                                ["具体情形:", msgParse.test79=='有此类问题'? msgParse.test80:'', 12],
-                                                ["整改情况:", msgParse.test79=='有此类问题'? msgParse.test81:'', 12],
-                                                ["隐患问题:", msgParse.test82=='有此类问题'?'存在未明确消防安全责任人、管理人及其职责的行为':'', 12],
-                                                ["具体情形:", msgParse.test82=='有此类问题'? msgParse.test83:'', 12],
-                                                ["整改情况:", msgParse.test82=='有此类问题'? msgParse.test84:'', 12],
-                                                ["隐患问题:", msgParse.test85=='有此类问题'?'存在消防控制室值班人员未能够熟练操作设施设备的行为':'', 12],
-                                                ["具体情形:", msgParse.test85=='有此类问题'? msgParse.test86:'', 12],
-                                                ["整改情况:", msgParse.test85=='有此类问题'? msgParse.test87:'', 12],
-                                                ["隐患问题:", msgParse.test88=='有此类问题'?'微型消防站队员未能掌握初步处置初期火灾的能力':'', 12],
-                                                ["具体情形:", msgParse.test88=='有此类问题'? msgParse.test89:'', 12],
-                                                ["整改情况:", msgParse.test88=='有此类问题'? msgParse.test90:'', 12],
-                                                ["隐患问题:", msgParse.test91=='有此类问题'?'防火巡查制度未落实':'', 12],
-                                                ["具体情形:", msgParse.test91=='有此类问题'? msgParse.test92:'', 12],
-                                                ["整改情况:", msgParse.test91=='有此类问题'? msgParse.test93:'', 12],
-                                                ["隐患问题:", msgParse.test94=='有此类问题'?'单位对于隐患问题未能及时落实安全防范措施':'', 12],
-                                                ["具体情形:", msgParse.test94=='有此类问题'? msgParse.test95:'', 12],
-                                                ["整改情况:", msgParse.test94=='有此类问题'? msgParse.test96:'', 12],
-                                                ["隐患问题:", msgParse.test97=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
-                                                ["具体情形:", msgParse.test97=='有此类问题'? msgParse.test98:'', 12],
-                                                ["整改情况:", msgParse.test97=='有此类问题'? msgParse.test99:'', 12],
-                                                ["隐患问题:", msgParse.test100=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
-                                                ["具体情形:", msgParse.test100=='有此类问题'? msgParse.test101:'', 12],
-                                                ["整改情况:", msgParse.test100=='有此类问题'? msgParse.test102:'', 12],
-                                                ["隐患问题:", msgParse.test103=='有此类问题'?'单位未定期开展建筑消防设施检测和维护保养':'', 12],
-                                                ["具体情形:", msgParse.test103=='有此类问题'? msgParse.test104:'', 12],
-                                                ["整改情况:", msgParse.test103=='有此类问题'? msgParse.test105:'', 12],
-                                                ["隐患问题:", msgParse.test106=='有此类问题'?'其他火灾隐患或消防违法行为':'', 12],
-                                                ["具体情形:", msgParse.test106=='有此类问题'? msgParse.test107:'', 12],
-                                                ["整改情况:", msgParse.test106=='有此类问题'? msgParse.test108:'', 12],
-
-
-                                            ],
-                                        }, ];
-                                        this.popup(val._attrbutes, arrayList, true)
-                                    }
-                                    //消防安全重点单位
-                                    if (val.attrbutes.facilityType == 1000) {
-                                        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)
+                                        this.$axios.post(this.$api.water.baseGgpFacilityList,{
+                                                "facilityType": [39],
+                                                "id": val.attrbutes.id,
+                                        }).then((res) => {
+                                            let msgParse = JSON.parse(res.data[0].extendData)
+                                            let arrayList = [{
+                                                title: [res.data[0].facilityName, true],
+                                                children: [
+                                                    ["所属街镇:", res.data[0].streetTown, 12],
+                                                    ["网格号:", msgParse.facilityNum, 12],
+                                                    ["位置:", res.data[0].address, 24],
+                                                    ["统一社会代码:", msgParse.test5, 24],
+                                                    ["场所面积:", msgParse.test7, 12],
+                                                    ["安全责任人:", res.data[0].contact, 12],
+                                                    ["安全管理人:", msgParse.test6, 12],
+                                                    ["单位类型:", msgParse.test3, 12],
+                                                    ["单位使用性质:", msgParse.test4, 12],
+                                                    ["建筑性质:", msgParse.test8, 12],
+                                                    ["建筑结构:", msgParse.test9, 12],
+                                                    // ["隐患扣分:", msgParse.test111, 12],
+                                                    //     ["隐患等级:", res.data[0].address, 24],
+                                                    ["风险等级:", msgParse.test112, 12],
+
+                                                    ["隐患问题:", msgParse.test10=='有此类问题'?'存在灭火器材未保持完的情况':'', 12],
+                                                    ["具体情形:", msgParse.test10=='有此类问题'? msgParse.test11:'', 12],
+                                                    ["整改情况:", msgParse.test10=='有此类问题'? msgParse.test12:'', 12],
+                                                    ["隐患问题:", msgParse.test13=='有此类问题'?'存在违规住人“三合一”行为':'', 12],
+                                                    ["具体情形:", msgParse.test13=='有此类问题'? msgParse.test14:'', 12],
+                                                    ["整改情况:", msgParse.test13=='有此类问题'? msgParse.test15:'', 12],
+                                                    ["隐患问题:", msgParse.test16=='有此类问题'?'存在违规使用明火、电焊或私拉乱接电线 的行为':'', 12],
+                                                    ["具体情形:", msgParse.test16=='有此类问题'? msgParse.test17:'', 12],
+                                                    ["整改情况:", msgParse.test16=='有此类问题'? msgParse.test18:'', 12],
+                                                    ["隐患问题:", msgParse.test19=='有此类问题'?'存在应急照明、疏散指示标志损坏或缺失的行为':'', 12],
+                                                    ["具体情形:", msgParse.test19=='有此类问题'? msgParse.test20:'', 12],
+                                                    ["整改情况:", msgParse.test19=='有此类问题'? msgParse.test21:'', 12],
+                                                    ["隐患问题:", msgParse.test22=='有此类问题'?'存在违规占用疏散通道、安全出口的行为':'', 12],
+                                                    ["具体情形:", msgParse.test22=='有此类问题'? msgParse.test23:'', 12],
+                                                    ["整改情况:", msgParse.test22=='有此类问题'? msgParse.test24:'', 12],
+                                                    ["隐患问题:", msgParse.test25=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test25=='有此类问题'? msgParse.test26:'', 12],
+                                                    ["整改情况:", msgParse.test25=='有此类问题'? msgParse.test27:'', 12],
+                                                    ["隐患问题:", msgParse.test28=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test28=='有此类问题'? msgParse.test29:'', 12],
+                                                    ["整改情况:", msgParse.test28=='有此类问题'? msgParse.test30:'', 12],
+                                                    ["隐患问题:", msgParse.test31=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test31=='有此类问题'? msgParse.test32:'', 12],
+                                                    ["整改情况:", msgParse.test31=='有此类问题'? msgParse.test33:'', 12],
+                                                    ["隐患问题:", msgParse.test34=='有此类问题'?'存在消防设施未保持完好有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test34=='有此类问题'? msgParse.test35:'', 12],
+                                                    ["整改情况:", msgParse.test34=='有此类问题'? msgParse.test36:'', 12],
+                                                    ["隐患问题:", msgParse.test37=='有此类问题'?'存在违规设置影响逃生和灭火救援的障碍物':'', 12],
+                                                    ["具体情形:", msgParse.test37=='有此类问题'? msgParse.test38:'', 12],
+                                                    ["整改情况:", msgParse.test37=='有此类问题'? msgParse.test39:'', 12],
+                                                    ["隐患问题:", msgParse.test40=='有此类问题'?'存在疏散通道、安全出口数量设置不符合要求的行为':'', 12],
+                                                    ["具体情形:", msgParse.test40=='有此类问题'? msgParse.test41:'', 12],
+                                                    ["整改情况:", msgParse.test40=='有此类问题'? msgParse.test42:'', 12],
+                                                    ["隐患问题:", msgParse.test43=='有此类问题'?'存在火灾报警系统未保持完好有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test43=='有此类问题'? msgParse.test44:'', 12],
+                                                    ["整改情况:", msgParse.test43=='有此类问题'? msgParse.test45:'', 12],
+                                                    ["隐患问题:", msgParse.test46=='有此类问题'?'存在擅自停用消防设施的违法行为':'', 12],
+                                                    ["具体情形:", msgParse.test46=='有此类问题'? msgParse.test47:'', 12],
+                                                    ["整改情况:", msgParse.test46=='有此类问题'? msgParse.test48:'', 12],
+                                                    ["隐患问题:", msgParse.test49=='有此类问题'?'存在火灾报警联动控制系统未保持有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test49=='有此类问题'? msgParse.test50:'', 12],
+                                                    ["整改情况:", msgParse.test49=='有此类问题'? msgParse.test51:'', 12],
+                                                    ["隐患问题:", msgParse.test52=='有此类问题'?'存在违规使用可燃材料装修的行为':'', 12],
+                                                    ["具体情形:", msgParse.test52=='有此类问题'? msgParse.test53:'', 12],
+                                                    ["整改情况:", msgParse.test52=='有此类问题'? msgParse.test54:'', 12],
+                                                    ["隐患问题:", msgParse.test55=='有此类问题'?'存在违规使用可燃材料搭建临时建筑的行为':'', 12],
+                                                    ["具体情形:", msgParse.test55=='有此类问题'? msgParse.test56:'', 12],
+                                                    ["整改情况:", msgParse.test55=='有此类问题'? msgParse.test57:'', 12],
+                                                    ["隐患问题:", msgParse.test58=='有此类问题'?'存在未按规范设置防火分隔的行为':'', 12],
+                                                    ["具体情形:", msgParse.test58=='有此类问题'? msgParse.test59:'', 12],
+                                                    ["整改情况:", msgParse.test58=='有此类问题'? msgParse.test60:'', 12],
+                                                    ["隐患问题:", msgParse.test61=='有此类问题'?'存在防火隔墙、防火卷帘、防火门等防火分隔设施损坏或缺失的行为':'', 12],
+                                                    ["具体情形:", msgParse.test61=='有此类问题'? msgParse.test62:'', 12],
+                                                    ["整改情况:", msgParse.test61=='有此类问题'? msgParse.test63:'', 12],
+                                                    ["隐患问题:", msgParse.test64=='有此类问题'?'存在常闭式防火门未保持常闭状态的行为':'', 12],
+                                                    ["具体情形:", msgParse.test64=='有此类问题'? msgParse.test65:'', 12],
+                                                    ["整改情况:", msgParse.test64=='有此类问题'? msgParse.test66:'', 12],
+                                                    ["隐患问题:", msgParse.test67=='有此类问题'?'存在未按规范要求做好防火封堵的行为':'', 12],
+                                                    ["具体情形:", msgParse.test67=='有此类问题'? msgParse.test68:'', 12],
+                                                    ["整改情况:", msgParse.test67=='有此类问题'? msgParse.test69:'', 12],
+                                                    ["隐患问题:", msgParse.test70=='有此类问题'?'存在违规使用、储存易燃易爆危险品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test70=='有此类问题'? msgParse.test71:'', 12],
+                                                    ["整改情况:", msgParse.test70=='有此类问题'? msgParse.test72:'', 12],
+                                                    ["隐患问题:", msgParse.test73=='有此类问题'?'存在公共娱乐场所违规使用可燃材料装修的行为':'', 12],
+                                                    ["具体情形:", msgParse.test73=='有此类问题'? msgParse.test74:'', 12],
+                                                    ["整改情况:", msgParse.test73=='有此类问题'? msgParse.test75:'', 12],
+                                                    ["隐患问题:", msgParse.test76=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test76=='有此类问题'? msgParse.test77:'', 12],
+                                                    ["整改情况:", msgParse.test76=='有此类问题'? msgParse.test78:'', 12],
+                                                    ["隐患问题:", msgParse.test79=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test79=='有此类问题'? msgParse.test80:'', 12],
+                                                    ["整改情况:", msgParse.test79=='有此类问题'? msgParse.test81:'', 12],
+                                                    ["隐患问题:", msgParse.test82=='有此类问题'?'存在未明确消防安全责任人、管理人及其职责的行为':'', 12],
+                                                    ["具体情形:", msgParse.test82=='有此类问题'? msgParse.test83:'', 12],
+                                                    ["整改情况:", msgParse.test82=='有此类问题'? msgParse.test84:'', 12],
+                                                    ["隐患问题:", msgParse.test85=='有此类问题'?'存在消防控制室值班人员未能够熟练操作设施设备的行为':'', 12],
+                                                    ["具体情形:", msgParse.test85=='有此类问题'? msgParse.test86:'', 12],
+                                                    ["整改情况:", msgParse.test85=='有此类问题'? msgParse.test87:'', 12],
+                                                    ["隐患问题:", msgParse.test88=='有此类问题'?'微型消防站队员未能掌握初步处置初期火灾的能力':'', 12],
+                                                    ["具体情形:", msgParse.test88=='有此类问题'? msgParse.test89:'', 12],
+                                                    ["整改情况:", msgParse.test88=='有此类问题'? msgParse.test90:'', 12],
+                                                    ["隐患问题:", msgParse.test91=='有此类问题'?'防火巡查制度未落实':'', 12],
+                                                    ["具体情形:", msgParse.test91=='有此类问题'? msgParse.test92:'', 12],
+                                                    ["整改情况:", msgParse.test91=='有此类问题'? msgParse.test93:'', 12],
+                                                    ["隐患问题:", msgParse.test94=='有此类问题'?'单位对于隐患问题未能及时落实安全防范措施':'', 12],
+                                                    ["具体情形:", msgParse.test94=='有此类问题'? msgParse.test95:'', 12],
+                                                    ["整改情况:", msgParse.test94=='有此类问题'? msgParse.test96:'', 12],
+                                                    ["隐患问题:", msgParse.test97=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
+                                                    ["具体情形:", msgParse.test97=='有此类问题'? msgParse.test98:'', 12],
+                                                    ["整改情况:", msgParse.test97=='有此类问题'? msgParse.test99:'', 12],
+                                                    ["隐患问题:", msgParse.test100=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
+                                                    ["具体情形:", msgParse.test100=='有此类问题'? msgParse.test101:'', 12],
+                                                    ["整改情况:", msgParse.test100=='有此类问题'? msgParse.test102:'', 12],
+                                                    ["隐患问题:", msgParse.test103=='有此类问题'?'单位未定期开展建筑消防设施检测和维护保养':'', 12],
+                                                    ["具体情形:", msgParse.test103=='有此类问题'? msgParse.test104:'', 12],
+                                                    ["整改情况:", msgParse.test103=='有此类问题'? msgParse.test105:'', 12],
+                                                    ["隐患问题:", msgParse.test106=='有此类问题'?'其他火灾隐患或消防违法行为':'', 12],
+                                                    ["具体情形:", msgParse.test106=='有此类问题'? msgParse.test107:'', 12],
+                                                    ["整改情况:", msgParse.test106=='有此类问题'? msgParse.test108:'', 12],
+
+
+                                                ],
+                                            }, ];
+                                            this.popup(val._attrbutes, arrayList, true)
+                                        })
                                     }
 
+                            }
+                            //沿街门面
+                            if (type == "沿街门面") {
+                                        //九小场所
+                                    if (val.attrbutes.facilityType == 39) {
+                                        this.$axios.post(this.$api.water.baseGgpFacilityList,{
+                                                "facilityType": [39],
+                                                "id": val.attrbutes.id,
+                                        }).then((res) => {
+                                            let msgParse = JSON.parse(res.data[0].extendData)
+                                            let arrayList = [{
+                                                title: [type, true],
+                                                children: [
+                                                    ["名称:", res.data[0].facilityName, 12],
+                                                    ["所属街镇:", res.data[0].streetTown, 12],
+                                                    ["网格号:", msgParse.facilityNum, 12],
+                                                    ["位置:", res.data[0].address, 24],
+                                                    ["统一社会代码:", msgParse.test5, 24],
+                                                    ["场所面积:", msgParse.test7, 12],
+                                                    ["安全责任人:", res.data[0].contact, 12],
+                                                    ["安全管理人:", msgParse.test6, 12],
+                                                    ["单位类型:", msgParse.test3, 12],
+                                                    ["单位使用性质:", msgParse.test4, 12],
+                                                    ["建筑性质:", msgParse.test8, 12],
+                                                    ["建筑结构:", msgParse.test9, 12],
+                                                    // ["隐患扣分:", msgParse.test111, 12],
+                                                    //     ["隐患等级:", res.data[0].address, 24],
+                                                    ["风险等级:", msgParse.test112, 12],
+
+                                                    ["隐患问题:", msgParse.test10=='有此类问题'?'存在灭火器材未保持完的情况':'', 12],
+                                                    ["具体情形:", msgParse.test10=='有此类问题'? msgParse.test11:'', 12],
+                                                    ["整改情况:", msgParse.test10=='有此类问题'? msgParse.test12:'', 12],
+                                                    ["隐患问题:", msgParse.test13=='有此类问题'?'存在违规住人“三合一”行为':'', 12],
+                                                    ["具体情形:", msgParse.test13=='有此类问题'? msgParse.test14:'', 12],
+                                                    ["整改情况:", msgParse.test13=='有此类问题'? msgParse.test15:'', 12],
+                                                    ["隐患问题:", msgParse.test16=='有此类问题'?'存在违规使用明火、电焊或私拉乱接电线 的行为':'', 12],
+                                                    ["具体情形:", msgParse.test16=='有此类问题'? msgParse.test17:'', 12],
+                                                    ["整改情况:", msgParse.test16=='有此类问题'? msgParse.test18:'', 12],
+                                                    ["隐患问题:", msgParse.test19=='有此类问题'?'存在应急照明、疏散指示标志损坏或缺失的行为':'', 12],
+                                                    ["具体情形:", msgParse.test19=='有此类问题'? msgParse.test20:'', 12],
+                                                    ["整改情况:", msgParse.test19=='有此类问题'? msgParse.test21:'', 12],
+                                                    ["隐患问题:", msgParse.test22=='有此类问题'?'存在违规占用疏散通道、安全出口的行为':'', 12],
+                                                    ["具体情形:", msgParse.test22=='有此类问题'? msgParse.test23:'', 12],
+                                                    ["整改情况:", msgParse.test22=='有此类问题'? msgParse.test24:'', 12],
+                                                    ["隐患问题:", msgParse.test25=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test25=='有此类问题'? msgParse.test26:'', 12],
+                                                    ["整改情况:", msgParse.test25=='有此类问题'? msgParse.test27:'', 12],
+                                                    ["隐患问题:", msgParse.test28=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test28=='有此类问题'? msgParse.test29:'', 12],
+                                                    ["整改情况:", msgParse.test28=='有此类问题'? msgParse.test30:'', 12],
+                                                    ["隐患问题:", msgParse.test31=='有此类问题'?'存在电动自行车违规停放、充电的行为':'', 12],
+                                                    ["具体情形:", msgParse.test31=='有此类问题'? msgParse.test32:'', 12],
+                                                    ["整改情况:", msgParse.test31=='有此类问题'? msgParse.test33:'', 12],
+                                                    ["隐患问题:", msgParse.test34=='有此类问题'?'存在消防设施未保持完好有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test34=='有此类问题'? msgParse.test35:'', 12],
+                                                    ["整改情况:", msgParse.test34=='有此类问题'? msgParse.test36:'', 12],
+                                                    ["隐患问题:", msgParse.test37=='有此类问题'?'存在违规设置影响逃生和灭火救援的障碍物':'', 12],
+                                                    ["具体情形:", msgParse.test37=='有此类问题'? msgParse.test38:'', 12],
+                                                    ["整改情况:", msgParse.test37=='有此类问题'? msgParse.test39:'', 12],
+                                                    ["隐患问题:", msgParse.test40=='有此类问题'?'存在疏散通道、安全出口数量设置不符合要求的行为':'', 12],
+                                                    ["具体情形:", msgParse.test40=='有此类问题'? msgParse.test41:'', 12],
+                                                    ["整改情况:", msgParse.test40=='有此类问题'? msgParse.test42:'', 12],
+                                                    ["隐患问题:", msgParse.test43=='有此类问题'?'存在火灾报警系统未保持完好有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test43=='有此类问题'? msgParse.test44:'', 12],
+                                                    ["整改情况:", msgParse.test43=='有此类问题'? msgParse.test45:'', 12],
+                                                    ["隐患问题:", msgParse.test46=='有此类问题'?'存在擅自停用消防设施的违法行为':'', 12],
+                                                    ["具体情形:", msgParse.test46=='有此类问题'? msgParse.test47:'', 12],
+                                                    ["整改情况:", msgParse.test46=='有此类问题'? msgParse.test48:'', 12],
+                                                    ["隐患问题:", msgParse.test49=='有此类问题'?'存在火灾报警联动控制系统未保持有效的行为':'', 12],
+                                                    ["具体情形:", msgParse.test49=='有此类问题'? msgParse.test50:'', 12],
+                                                    ["整改情况:", msgParse.test49=='有此类问题'? msgParse.test51:'', 12],
+                                                    ["隐患问题:", msgParse.test52=='有此类问题'?'存在违规使用可燃材料装修的行为':'', 12],
+                                                    ["具体情形:", msgParse.test52=='有此类问题'? msgParse.test53:'', 12],
+                                                    ["整改情况:", msgParse.test52=='有此类问题'? msgParse.test54:'', 12],
+                                                    ["隐患问题:", msgParse.test55=='有此类问题'?'存在违规使用可燃材料搭建临时建筑的行为':'', 12],
+                                                    ["具体情形:", msgParse.test55=='有此类问题'? msgParse.test56:'', 12],
+                                                    ["整改情况:", msgParse.test55=='有此类问题'? msgParse.test57:'', 12],
+                                                    ["隐患问题:", msgParse.test58=='有此类问题'?'存在未按规范设置防火分隔的行为':'', 12],
+                                                    ["具体情形:", msgParse.test58=='有此类问题'? msgParse.test59:'', 12],
+                                                    ["整改情况:", msgParse.test58=='有此类问题'? msgParse.test60:'', 12],
+                                                    ["隐患问题:", msgParse.test61=='有此类问题'?'存在防火隔墙、防火卷帘、防火门等防火分隔设施损坏或缺失的行为':'', 12],
+                                                    ["具体情形:", msgParse.test61=='有此类问题'? msgParse.test62:'', 12],
+                                                    ["整改情况:", msgParse.test61=='有此类问题'? msgParse.test63:'', 12],
+                                                    ["隐患问题:", msgParse.test64=='有此类问题'?'存在常闭式防火门未保持常闭状态的行为':'', 12],
+                                                    ["具体情形:", msgParse.test64=='有此类问题'? msgParse.test65:'', 12],
+                                                    ["整改情况:", msgParse.test64=='有此类问题'? msgParse.test66:'', 12],
+                                                    ["隐患问题:", msgParse.test67=='有此类问题'?'存在未按规范要求做好防火封堵的行为':'', 12],
+                                                    ["具体情形:", msgParse.test67=='有此类问题'? msgParse.test68:'', 12],
+                                                    ["整改情况:", msgParse.test67=='有此类问题'? msgParse.test69:'', 12],
+                                                    ["隐患问题:", msgParse.test70=='有此类问题'?'存在违规使用、储存易燃易爆危险品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test70=='有此类问题'? msgParse.test71:'', 12],
+                                                    ["整改情况:", msgParse.test70=='有此类问题'? msgParse.test72:'', 12],
+                                                    ["隐患问题:", msgParse.test73=='有此类问题'?'存在公共娱乐场所违规使用可燃材料装修的行为':'', 12],
+                                                    ["具体情形:", msgParse.test73=='有此类问题'? msgParse.test74:'', 12],
+                                                    ["整改情况:", msgParse.test73=='有此类问题'? msgParse.test75:'', 12],
+                                                    ["隐患问题:", msgParse.test76=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test76=='有此类问题'? msgParse.test77:'', 12],
+                                                    ["整改情况:", msgParse.test76=='有此类问题'? msgParse.test78:'', 12],
+                                                    ["隐患问题:", msgParse.test79=='有此类问题'?'存在违规存放易燃可燃物品的行为':'', 12],
+                                                    ["具体情形:", msgParse.test79=='有此类问题'? msgParse.test80:'', 12],
+                                                    ["整改情况:", msgParse.test79=='有此类问题'? msgParse.test81:'', 12],
+                                                    ["隐患问题:", msgParse.test82=='有此类问题'?'存在未明确消防安全责任人、管理人及其职责的行为':'', 12],
+                                                    ["具体情形:", msgParse.test82=='有此类问题'? msgParse.test83:'', 12],
+                                                    ["整改情况:", msgParse.test82=='有此类问题'? msgParse.test84:'', 12],
+                                                    ["隐患问题:", msgParse.test85=='有此类问题'?'存在消防控制室值班人员未能够熟练操作设施设备的行为':'', 12],
+                                                    ["具体情形:", msgParse.test85=='有此类问题'? msgParse.test86:'', 12],
+                                                    ["整改情况:", msgParse.test85=='有此类问题'? msgParse.test87:'', 12],
+                                                    ["隐患问题:", msgParse.test88=='有此类问题'?'微型消防站队员未能掌握初步处置初期火灾的能力':'', 12],
+                                                    ["具体情形:", msgParse.test88=='有此类问题'? msgParse.test89:'', 12],
+                                                    ["整改情况:", msgParse.test88=='有此类问题'? msgParse.test90:'', 12],
+                                                    ["隐患问题:", msgParse.test91=='有此类问题'?'防火巡查制度未落实':'', 12],
+                                                    ["具体情形:", msgParse.test91=='有此类问题'? msgParse.test92:'', 12],
+                                                    ["整改情况:", msgParse.test91=='有此类问题'? msgParse.test93:'', 12],
+                                                    ["隐患问题:", msgParse.test94=='有此类问题'?'单位对于隐患问题未能及时落实安全防范措施':'', 12],
+                                                    ["具体情形:", msgParse.test94=='有此类问题'? msgParse.test95:'', 12],
+                                                    ["整改情况:", msgParse.test94=='有此类问题'? msgParse.test96:'', 12],
+                                                    ["隐患问题:", msgParse.test97=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
+                                                    ["具体情形:", msgParse.test97=='有此类问题'? msgParse.test98:'', 12],
+                                                    ["整改情况:", msgParse.test97=='有此类问题'? msgParse.test99:'', 12],
+                                                    ["隐患问题:", msgParse.test100=='有此类问题'?'单位员工未能熟练掌握“一懂三会”':'', 12],
+                                                    ["具体情形:", msgParse.test100=='有此类问题'? msgParse.test101:'', 12],
+                                                    ["整改情况:", msgParse.test100=='有此类问题'? msgParse.test102:'', 12],
+                                                    ["隐患问题:", msgParse.test103=='有此类问题'?'单位未定期开展建筑消防设施检测和维护保养':'', 12],
+                                                    ["具体情形:", msgParse.test103=='有此类问题'? msgParse.test104:'', 12],
+                                                    ["整改情况:", msgParse.test103=='有此类问题'? msgParse.test105:'', 12],
+                                                    ["隐患问题:", msgParse.test106=='有此类问题'?'其他火灾隐患或消防违法行为':'', 12],
+                                                    ["具体情形:", msgParse.test106=='有此类问题'? msgParse.test107:'', 12],
+                                                    ["整改情况:", msgParse.test106=='有此类问题'? msgParse.test108:'', 12],
 
-                                }
+
+                                                ],
+                                            }, ];
+                                            this.popup(val._attrbutes, arrayList, true)
+                                        })
+                                    }
 
                             }
+                            //新消监监督检查----------------------
+                            if (type == "新消监" && val.attrbutes.facilityType == 42) {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: ["监督检查", true],
+                                    children: [
+                                        ["单位名称:", val.attrbutes.facilityName, 24],
+                                        ["地址:", 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.test5, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
                             //疏导区基本情况----------------------
                             if (type == "消防安全重点单位") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
@@ -2898,8 +3058,7 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "学校") {
-                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                            if (type == "儿童福利机构") {
                                 let arrayList = [{
                                     title: [type, true],
                                     children: [
@@ -2908,10 +3067,6 @@ 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],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -3674,7 +3829,13 @@ export default {
                             p1.innerHTML = arrayList[0].children[i][0]
                                 // if()
                             let p2 = document.createElement('span');
-                            p2.setAttribute('style', 'color:#fff;word-break:break-all !important');
+                            if(arrayList[0].children[i][1] == "合格" || arrayList[0].children[i][1] == "复查合格"){
+                                p2.setAttribute('style', 'color:green;word-break:break-all !important');
+                            }else if(arrayList[0].children[i][1] == "不合格" || arrayList[0].children[i][1] == "复查不合格"){
+                                p2.setAttribute('style', 'color:red;word-break:break-all !important');
+                            }else{
+                                p2.setAttribute('style', 'color:#fff;word-break:break-all !important');
+                            }   
                             p2.innerHTML = arrayList[0].children[i][1]
                             textWrap.appendChild(p1)
                             textWrap.appendChild(p2)

+ 10 - 3
src/store/modules/public.js

@@ -99,6 +99,16 @@ const useStore = defineStore("public", {
             wgmc_qb: require("@a/img/sadian/wgmc_qb.png"), //大网格-七宝名称
             wgmc_hq: require("@a/img/sadian/wgmc_hq.png"), //大网格-虹桥名称
 
+            cfck: require("@a/img/sadian/cfck.png"), //厂房仓库
+            dtz: require("@a/img/sadian/dtz.png"), //地铁站
+            etfljg: require("@a/img/sadian/etfljg.png"), //儿童福利机构
+            gmzl: require("@a/img/sadian/gmzl.png"), //规模租赁
+            jdbg: require("@a/img/sadian/jdbg.png"), //酒店宾馆
+            jmxq: require("@a/img/sadian/jmxq.png"), //居民小区
+            pfsc: require("@a/img/sadian/pfsc.png"), //批发市场
+            yjmm: require("@a/img/sadian/yjmm.png"), //沿街门面
+            yljg2: require("@a/img/sadian/yljg2.png"), //医疗机构
+
         },
 
         xfzfdt: {}, //消防执法动态
@@ -212,15 +222,12 @@ const useStore = defineStore("public", {
     actions: {
         gridDataChange(data) {
             this.gridData = data
-            console.log(123, data)
         },
         gridDataChange1(data) {
             this.gridId = data
-            console.log(456, data)
         },
         jkspChange(data) {
             this.jkspData = data[0]
-            console.log(234, this.jkspData)
         },
 
         /**

+ 188 - 170
src/views/security-plan.vue

@@ -23,9 +23,9 @@
                                             style="color: #01E0FF;font-weight: 600;font-size: 0.26rem"
                                         >
                                         
-                                            <!-- <CountTo :startVal="0" :endVal="item.value || 0" :duration="3000" v-if="!isNaN(item.value)">{{ item.value || 0 }}</CountTo>
-                                            <span v-if="isNaN(item.value)" style="fontSize: 0.2rem !important">{{ item.value || 0 }}</span> -->
-                                            <span>{{ item.value }}</span>
+                                            <!-- <CountTo :startVal="0" :endVal="item.value || 0" :duration="3000" v-if="!isNaN(item.value)">{{ item.value || 0 }}</CountTo>-->
+                                            <span v-if="isNaN(item.value)" style="fontSize: 0.2rem !important">{{ item.value || 0 }}</span> 
+                                            <span v-if="!isNaN(item.value)">{{ item.value }}</span>
                                         </Strong>
                                         {{ item.unit }}
                                     </span>
@@ -278,7 +278,7 @@
                                 <span>重点单位</span>
                             </div> -->
 
-                            <div
+                            <!-- <div
                                 :class="
                                     checkedArray.checkedData[0] == 4
                                         ? 'checkTypeSelect'
@@ -334,7 +334,7 @@
                                 >
                                     <el-option v-for="item in checkedSelectArray" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                                 </el-select>
-                            </div>
+                            </div> -->
                             <div @click="checkboxChange(19)" :class="checkedArray.checkedData[0] == 19 ? 'checkTypeSelect' : ''">
                                 <img :src="stores.sadianIcon.d" alt="" />
                                 <span>大网格</span>
@@ -347,14 +347,14 @@
                                 <img :src="stores.sadianIcon.x" alt="" />
                                 <span>小网格</span>
                             </div>
-                            <div @click="checkboxChange(17)" :class="checkedArray.checkedData[0] == 17 ? 'checkTypeSelect' : ''">
+                            <!-- <div @click="checkboxChange(17)" :class="checkedArray.checkedData[0] == 17 ? 'checkTypeSelect' : ''">
                                 <img :src="stores.sadianIcon.ssjq" alt="" />
                                 <span>监控视频</span>
                             </div>
                             <div @click="checkboxChange(18)" :class="checkedArray.checkedData[0] == 18 ? 'checkTypeSelect' : ''">
                                 <img :src="stores.sadianIcon.jdjc" alt="" />
                                 <span>监督检查</span>
-                            </div>
+                            </div> -->
                             <div @click="checkboxChange(20)" :class="checkedArray.checkedData[0] == 20 ? 'checkTypeSelect' : ''">
                                 <img :src="stores.sadianIcon.zfjly" alt="" />
                                 <span>执法记录仪</span>
@@ -379,21 +379,8 @@
                                 </el-col>
                             </el-row>
                         </Vue3SeamlessScroll>
-
-                        <!-- <el-row>
-                            <el-col><a href="http://32.0.15.107:8080/mhvi/20231031.pdf" target="_blank">第七期 第六届中国国际进口博览会每日工作动态</a></el-col>
-                            <el-col><a href="http://32.0.15.107:8080/mhvi/20231030.pdf" target="_blank">第六期 第六届中国国际进口博览会每日工作动态</a></el-col>
-                            <el-col><a href="http://32.0.15.107:8080/mhvi/20231027.pdf" target="_blank">第五期 第六届中国国际进口博览会每日工作动态</a></el-col>
-                            <el-col><a href="http://32.0.15.107:8080/mhvi/20231026.pdf" target="_blank">第四期 第六届中国国际进口博览会每日工作动态</a></el-col>
-                            <el-col><a href="http://32.0.15.107:8080/mhvi/20231025.pdf" target="_blank">第三期 第六届中国国际进口博览会每日工作动态</a></el-col>
-                            <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> -->
                 
                     </div>
-                   
-                    
-          
                 </div>
 
                 <!-- 疏导区网格检查情况 start -->
@@ -402,13 +389,13 @@
                     <div class="girdCheckItem">
                         <div class="row_g">
                             <div style="font-size:.175rem">累计:</div>
-                            <div >检查家数<br>4558家次</div>
-                            <div >发现隐患数<br>747处</div>
-                            <div >整改隐患<br>747处</div>
+                            <div @click="basicStaticsData('新消监')">检查家数<br>6279家次</div>
+                            <div @click="basicStaticsData('新消监')">发现隐患数<br>2418处</div>
+                            <div @click="basicStaticsData('新消监')">整改隐患<br>1885处</div>
                             <div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
-                            <div >检查家数<br>125家次</div>
-                            <div >发现隐患数<br>46处</div>
-                            <div >整改隐患<br>46处</div>
+                            <div @click="basicStaticsData('新消监')">检查家数<br>127家次</div>
+                            <div @click="basicStaticsData('新消监')">发现隐患数<br>50处</div>
+                            <div @click="basicStaticsData('新消监')">整改隐患<br>48处</div>
                         </div>
                     </div>
                     <div style="display: flex">
@@ -1071,7 +1058,20 @@ export default {
             check: '1',
             dialogTableVisible:false,
             pdfUrl:'',
-            dailyArray:[{
+            dailyArray:[
+                {
+                    title: '第十期:  第六届中国国际进口博览会每日工作动态',
+                    url: 'http://32.0.15.107:8080/mhvi/20231101.pdf',
+                },
+                {
+                    title: '第九期:  第六届中国国际进口博览会每日工作动态',
+                    url: 'http://32.0.15.107:8080/mhvi/20231102.pdf',
+                },
+                {
+                    title: '第八期:  第六届中国国际进口博览会每日工作动态',
+                    url: 'http://32.0.15.107:8080/mhvi/20231031.pdf',
+                },
+                {
                     title: '第七期:  第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231031.pdf',
                 },
@@ -1104,51 +1104,56 @@ export default {
             // 大中网格数据渲染 start
             tableDataGrid:[],
             tableDataBigGrid:[{
-                    id: '闵S1(华漕网格)',
-                    count1: '1319',
-                    count2: '486',
-                    count3: '344',
-                },
-                {
-                    id: '闵S2(新虹网格)',
-                    count1: '1612',
-                    count2: '563',
-                    count3: '490',
-                },
-                {
-                    id: '闵S3(七宝网格)',
-                    count1: '1525',
-                    count2: '484',
-                    count3: '389',
-                },
-                {
-                    id: '闵S4(虹桥网格)',
-                    count1: '1360',
-                    count2: '566',
-                    count3: '392',
-            }],
+                    id: '闵S1(华漕网格)',
+                    count1: '1361',
+                    count2: '499',
+                    count3: '355',
+                },
+                {
+                    id: '闵S2(华漕网格)',
+                    count1: '1674',
+                    count2: '564',
+                    count3: '491',
+                },
+                {
+                    id: '闵S3(华漕网格)',
+                    count1: '1585',
+                    count2: '487',
+                    count3: '391',
+                },{
+                    id: '闵S4(华漕网格)',
+                    count1: '1412',
+                    count2: '577',
+                    count3: '402',
+                }],
+
+
+
+
+
+            
             tableDataMiddleGrid:[{
                     id: '闵S1-1(华漕网格)',
-                    count1: '207',
-                    count2: '88',
-                    count3: '64',
+                    count1: '225',
+                    count2: '90',
+                    count3: '66',
                 },
                 {
                     id: '闵S1-2(华漕网格)',
-                    count1: '134',
-                    count2: '52',
-                    count3: '40',
+                    count1: '141',
+                    count2: '57',
+                    count3: '44',
                 },
                 {
                     id: '闵S1-3(华漕网格)',
-                    count1: '157',
-                    count2: '57',
-                    count3: '38',
+                    count1: '164',
+                    count2: '58',
+                    count3: '39',
                 },{
                     id: '闵S1-4(华漕网格)',
-                    count1: '523',
-                    count2: '192',
-                    count3: '126',
+                    count1: '537',
+                    count2: '197',
+                    count3: '130',
                 },{
                     id: '闵S1-5(华漕网格)',
                     count1: '253',
@@ -1156,9 +1161,9 @@ export default {
                     count3: '66',
                 },{
                     id: '闵S2-1(新虹网格)',
-                    count1: '565',
-                    count2: '127',
-                    count3: '83',
+                    count1: '627',
+                    count2: '138',
+                    count3: '93',
                 },{
                     id: '闵S2-2(新虹网格)',
                     count1: '225',
@@ -1181,23 +1186,23 @@ export default {
                     count3: '105',
                 },{
                     id: '闵S3-2(七宝网格)',
-                    count1: '158',
+                    count1: '171',
                     count2: '48',
                     count3: '34',
                 },{
                     id: '闵S3-3(七宝网格)',
-                    count1: '298',
-                    count2: '303',
-                    count3: '129',
+                    count1: '344',
+                    count2: '306',
+                    count3: '131',
                 },{
                      id: '闵S4-1(虹桥网格)',
-                    count1: '873',
+                    count1: '893',
                     count2: '346',
                     count3: '272',
                 },{ id: '闵S4-2(虹桥网格)',
-                    count1: '467',
-                    count2: '124',
-                    count3: '114',
+                    count1: '499',
+                    count2: '125',
+                    count3: '115',
                 }],
 
 
@@ -1280,7 +1285,7 @@ export default {
                 
             ],//处置网格header
 
-        value111:23,   
+        value111:40,   
         //24、厂房仓库?? 25、大型商业综合体??  27、批发市场?? 
         // 23、宾馆酒店  26、规模租赁公寓 28、三合一场所 29、养老机构 30、医疗机构
         options: [
@@ -1402,7 +1407,7 @@ export default {
                 {
                     "name": "沿街门面",
                     "count": 3080,
-                    "value":39  //?
+                    "value":399  //
                 },
                 // {
                 //     "name": "办公楼宇",
@@ -1438,7 +1443,7 @@ export default {
                 {
                     "name": "地铁站",
                     "count": 4,
-                    "value":3 //?
+                    "value":43 //?
                 }
                 
             ],
@@ -1450,7 +1455,7 @@ export default {
                     "streetTown": "消防站",
                     "count": 4,
                     "color": "#FF0709",
-                    "facilityType":30
+                    "facilityType":0
                 },
                 {
                     "streetTown": "流动消防站(一级)",
@@ -1843,7 +1848,7 @@ export default {
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
         this.anbaoSDUWG2()//疏导区网格
-        this.basicStaticsData(39)
+        this.basicStaticsData(39)//九小场所统计
         // this.llbutj()//力量部署统计
 
         // this.staticsSd()  // 疏导区基本情况统计
@@ -1864,7 +1869,6 @@ export default {
                     })
             );
             if (res.data) {
-               console.log(res.data.keyCompanyNum)
                this.line3Array[0].count=res.data.keyCompanyNum; //重点单位
                this.line3Array[1].count=res.data.largeBuildNum;//大型商业综合体
                this.line3Array[2].count=res.data.hotelNum;//宾馆酒店
@@ -2016,6 +2020,9 @@ export default {
             this.addMarker(arr, "security-plan", val)
         },
         goPoints(type){
+            if(type == 0){
+                retuen
+            }
                 this.anbaoSDUWG()
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [type ] 
@@ -2059,7 +2066,12 @@ export default {
                             })
                     )
                     .then((res) => {
-                        this.anbaoSDUWG()//疏导区网格
+                        
+                        let data2 = {
+                            gisX: 121.302183,
+                            gisY: 31.189991,
+                            type: "国家会展中心",
+                        };
                         if (res.data.length > 0) {
                             //点分布
                             let data = res.data;
@@ -2070,83 +2082,85 @@ export default {
                                 arr[i].companyId = data[i].companyId;
                                 arr[i].type = type;
                             }
-                            setTimeout(() => {
-                                this.addMarker(arr.splice(0, 500), "self-management", id == 0 ? "高风险" : id ==1 ? "较高风险" : id == 2 ?  "一般风险" : id == 3 ? "低风险" : "");
-                            }, 500);
+                            arr.unshift(data2)
+                            this.addMarker(arr.splice(0, 500), "self-management", id == 0 ? "高风险" : id ==1 ? "较高风险" : id == 2 ?  "一般风险" : id == 3 ? "低风险" : "");
                         } else {
-                            this.addMarker([], "self-management", type);
-                           
+                            
+                            this.addMarker(arr, "self-management", type);
+                            
                         }
+                        this.anbaoSDUWG()//疏导区网格
+                        
                     });
         },
 
         basicStaticsData(type,name){  //疏导区基本情况 统计点击事件
-                
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
-                                "facilityType": [type ] 
-                        }).then((res) => {
-                                let arr = []
-                                if(res.data.length>0){
-                                        arr = res.data;
-                                        this.arrayData= res.data;
-                                        let data = {
-                                            gisX: 121.302183,
-                                            gisY: 31.189991,
-                                            type: "国家会展中心",
-                                        };
-                                        arr.push(data)
-                                        let dataOther = []
-                                        if(type == 39){ //九小场所
-                                                this.anbaoSDUWG()//疏导区网格
-                                                if(name){
-                                                        // console.log(arr)
-                                                        for(let i=0;i<arr.length;i++){
-                                                        // for(let i=0;i<1300;i++){
-                                                                if(arr[i].extendData){
-                                                                        // console.log(i,arr[i],JSON.parse(arr[i].extendData).test112,name)
-                                                                        if(name == JSON.parse(arr[i].extendData).test112){
-                                                                                dataOther.push(arr[i])
-                                                                        }
-                                                                }
-                                                                
+                    "facilityType": type == "新消监" ? [39,42] : type == 399 ? [39] : [type]
+            }).then((res) => {
+                    let arr = []
+                    if(res.data.length>0){
+                            arr = res.data;
+                            this.arrayData= res.data;
+                            let data = {
+                                gisX: 121.302183,
+                                gisY: 31.189991,
+                                type: "国家会展中心",
+                            };
+                            arr.push(data)
+                            //新消监
+                            if(type == "新消监"){
+                                this.addMarker(arr, "security-plan", type)
+                            }else{
+                                let dataOther = [data]
+                            if(type == 39){ //九小场所
+                                this.anbaoSDUWG()//疏导区网格
+                                    if(name){
+                                            for(let i=0;i<arr.length;i++){
+                                                if(arr[i].checkComment){
+                                                    if(name == arr[i].checkComment){
+                                                            dataOther.push(arr[i])
+                                                    }
+                                                }
+                                            }
+                                            this.addMarker(dataOther, "security-plan", name)
+                                    }else{
+                                            this.jxcstj = [0,0,0,0]
+                                            for(let i=0;i<arr.length;i++){
+                                                    if(arr[i].checkComment){
+                                                        if(arr[i].checkComment == "高风险"){
+                                                                this.jxcstj[0] ++
                                                         }
-                                                        this.addMarker(dataOther, "security-plan", name)
-                                                }else{
-                                                        this.jxcstj = [0,0,0,0]
-                                                        for(let i=0;i<arr.length;i++){
-                                                                if(arr[i].extendData && JSON.parse(arr[i].extendData)){
-                                                                        if(JSON.parse(arr[i].extendData).test112 == "高风险"){
-                                                                                this.jxcstj[0] ++
-                                                                        }
-                                                                        if(JSON.parse(arr[i].extendData).test112 == "较高风险"){
-                                                                                this.jxcstj[1] ++
-                                                                        }
-                                                                        if(JSON.parse(arr[i].extendData).test112 == "一般风险"){
-                                                                                this.jxcstj[2] ++
-                                                                        }
-                                                                        if(JSON.parse(arr[i].extendData).test112 == "低风险"){
-                                                                                this.jxcstj[3] ++
-                                                                        }
-                                                                }
+                                                        if(arr[i].checkComment == "较高风险"){
+                                                                this.jxcstj[1] ++
                                                         }
-                                                       
-                                                }
-                                                
-                                        }else{
-                                                this.anbaoSDUWG()//疏导区网格
-                                                this.addMarker(arr, "security-plan", name)
-                                        }
+                                                        if(arr[i].checkComment == "一般风险"){
+                                                                this.jxcstj[2] ++
+                                                        }
+                                                        if(arr[i].checkComment == "低风险"){
+                                                                this.jxcstj[3] ++
+                                                        }
+                                                    }
+                                            }
                                         
-                                        // if(type=='29'){
-                                        //     this.addMarker(arr, "security-plan", "养老机构")
-                                        // }else if(type=='30'){
-                                        //     this.addMarker(arr, "security-plan", "医疗机构")
-                                        // }
-                                }  
-                        });
+                                    }
+                                }else{
+                                    this.addMarker(arr, "security-plan", name)
+                                }
+                            }
+                            if(type == 399){ //沿街门面 左侧顶部
+                                this.addMarker(dataOther, "security-plan", name)
 
-           
-            // this.basicStatisStatus=false;
+                            }
+                            
+                            this.anbaoSDUWG()//疏导区网格
+                            // if(type=='29'){
+                            //     this.addMarker(arr, "security-plan", "养老机构")
+                            // }else if(type=='30'){
+                            //     this.addMarker(arr, "security-plan", "医疗机构")
+                            // }
+                    }  
+            });
         },
         basicGoBack(){  //疏导区基本情况 返回
 
@@ -2398,6 +2412,7 @@ export default {
                 let arr = [];
                 let zfjly = [];
                 if (res.data.length > 0) {
+                   
                     let data = res.data;
                     for (let i = 0; i < data.length; i++) {
                         if (data[i].otherNames?.status_name == "在线") {
@@ -2419,23 +2434,23 @@ export default {
                         }
                     }
                     for (let i = 0; i < arr.length; i++) {
-                        if (
-                            arr[i].name.indexOf("单兵") == "-1" &&
-                            arr[i].name.indexOf("无人机") == "-1" &&
-                            arr[i].name.indexOf("布控球") == "-1"
-                        ) {
+                        if (arr[i].name.indexOf("单兵") > -1 || arr[i].name.indexOf("无人机") > -1 || arr[i].name.indexOf("布控球") > -1) {
+                            
+                        }else{
                             zfjly.push(arr[i]);
                         }
                     }
                     this.selectVideoData = zfjly;
+                    let sd = []
                     if (arr.length > 0 && id) {
                         let data = {
                             gisX: 121.302183,
                             gisY: 31.189991,
                             type: "国家会展中心",
                         };
-                        arr.push(data)
-                        this.addMarker(arr, "enforcement-dynamic","执法记录仪");
+                        sd = JSON.parse(JSON.stringify(zfjly))
+                        sd.push(data)
+                        this.addMarker(sd, "enforcement-dynamic","执法记录仪");
                     }
                 }
             });
@@ -2582,14 +2597,16 @@ export default {
             } else if (id == 16) {
                 this.gridStatus = id;
                 this.grid(16, null, null, 1);
-                // this.anbaoMap()
-                // this.anbao(1, 2);
-                this.hzzxtb()
-                this.anbaoSDUWG()//疏导区网格
+                setTimeout(()=>{
+                    this.hzzxtb()
+                    this.anbaoSDUWG()//疏导区网格
+                },2000)
+                
             } else if (id == 17) {
                 this.surveillance()
                 this.hzzxtb()
                 this.anbaoSDUWG()//疏导区网格
+  
             } else if (id == 18) {
                 this.gridStatus = id;
                 this.sadianSelect(id);
@@ -2920,8 +2937,9 @@ export default {
          * area 区域名称
          * position 坐标
          * query 查询居委会名称
+         * x 小网格名称映射
          */
-        grid(id, area, position, query) {
+        grid(id, area, position, query,x) {
             let querySearch = {};
             let hzzx =[{
                 gisX: 121.302183,
@@ -2955,6 +2973,9 @@ export default {
                 };
             }
             this.$axios.get(this.$api.fireSite.gridMemberScatter + "?" + this.$qs.stringify(querySearch)).then((res) => {
+                if(id == 16 && x == 3){
+                    this.staticsSd(res.data[0].gridArea,3,'')
+                }
                 let data = res.data;
                 let gridData = [];
                 if (data.length > 0) {
@@ -2988,7 +3009,7 @@ export default {
                                         }
                                         if (data[i].gridMemderViceList[ii].personnelType == 9) {
                                             if (gridData[i].type3) {
-                                                gridData[i].type3 = `${gridData[i].type3}</br>${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                                gridData[i].type3 = `${gridData[i].type3}</br>                           ${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
                                             } else {
                                                 gridData[i].type3 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
                                             }
@@ -2997,7 +3018,7 @@ export default {
                                     if (id == 16) {
                                         if (data[i].gridMemderViceList[ii].personnelType == 10) {
                                             if (gridData[i].type1) {
-                                                gridData[i].type1 = `${gridData[i].type1}</br>${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                                gridData[i].type1 = `${gridData[i].type1}</br>                           ${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
                                             } else {
                                                 gridData[i].type1 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
                                             }
@@ -3059,6 +3080,7 @@ export default {
                         })
                 )
                 .then((res) => {
+                    
                     this.diversionArea = [];
                     if (res.data.length > 0) {
                         let data = res.data[0];
@@ -3071,7 +3093,7 @@ export default {
                                 color: "#7DD807",
                             };
                             this.diversionArea[1] = {
-                                name: "分管领导",
+                                name: "街镇分管领导",
                                 value: 0,
                                 unit: "人",
                                 color: "#01C3B4",
@@ -3109,7 +3131,7 @@ export default {
 
                             for (let i = 0; i < data.gridMemderViceList.length; i++) {
                                 if (data.gridMemderViceList[i].personnelType == 3) {
-                                    //分管领导
+                                    //街镇分管领导
                                     this.diversionArea[1].value++;
                                 }
                                 if (data.gridMemderViceList[i].personnelType == 4) {
@@ -3223,16 +3245,12 @@ export default {
 
     watch: {
         "stores.$state.gridData": function (newValue, oldValue) {
-            
             if (this.gridStatus == 15) {
-                
                 this.grid(15, newValue.name, newValue.position);
                 this.staticsSd(newValue.name,2,'')
-
-
             }
             if (this.gridStatus == 16) {
-                this.grid(16, newValue.name, newValue.position);
+                this.grid(16, newValue.name, newValue.position,null,3);
             }
         },
 
@@ -3734,11 +3752,10 @@ export default {
            
             .dailyItem{
                 vertical-align: middle;
-                margin-left:.5rem;
                 margin-top:.2rem;   
                 line-height:.375rem;
                 font-size:.175rem;
-                width:80%;
+                width:100%;
                 height:60%;
                 overflow-y:hidden;
                 display: inline-block;
@@ -3748,7 +3765,8 @@ export default {
                     border-bottom:1px solid #fff;
                 //     text-decoration: none;
                     text-decoration: none;
-                    cursor:pointer
+                    cursor:pointer;
+                    letter-spacing:4px;
                 }
             }
         }

+ 1 - 1
src/views/time-select.vue

@@ -64,7 +64,7 @@
             <el-row class="xj xj2"></el-row>
             <el-row class="xj xj3"></el-row>
             <el-row class="xj xj4"></el-row>
-            <p>安保阶段:2023年10月23日——11月25日</p>
+            <p>安保阶段:2023年10月25日——11月15日</p>
         </el-row>
     </el-row>
 </template>