bug修复

src/components/mixins/map-data1.js

@@ -138,97 +138,97 @@ export default {
                         { x: 121.35374042236845, y: 31.182090361752536, z: 0 },
                         { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
                     ],
-                    [{
-                            "x": 121.29577137421792,
-                            "y": 31.186824696355163,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29418329761764,
-                            "y": 31.18872030124066,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29280475525546,
-                            "y": 31.190723474492756,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29005251449192,
-                            "y": 31.194744686426272,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29837921625169,
-                            "y": 31.198135776426472,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29990431690115,
-                            "y": 31.195743378525012,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.3017996230984,
-                            "y": 31.19308143590054,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30362101641953,
-                            "y": 31.190462548748194,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30470085312731,
-                            "y": 31.188890418122178,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30488549898331,
-                            "y": 31.18841532634147,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30489353090678,
-                            "y": 31.187841598865855,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30487462397232,
-                            "y": 31.187226940195103,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30467806077046,
-                            "y": 31.187033387433935,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30391173448861,
-                            "y": 31.18654998998803,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.3031354194004,
-                            "y": 31.186067600959273,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30162566409005,
-                            "y": 31.18515069662575,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29858007896227,
-                            "y": 31.183287832294678,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29577137421792,
-                            "y": 31.186824696355163,
-                            "z": 0
-                        },
-                    ],
+                    // [{
+                    //         "x": 121.29577137421792,
+                    //         "y": 31.186824696355163,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29418329761764,
+                    //         "y": 31.18872030124066,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29280475525546,
+                    //         "y": 31.190723474492756,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29005251449192,
+                    //         "y": 31.194744686426272,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29837921625169,
+                    //         "y": 31.198135776426472,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29990431690115,
+                    //         "y": 31.195743378525012,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.3017996230984,
+                    //         "y": 31.19308143590054,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30362101641953,
+                    //         "y": 31.190462548748194,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30470085312731,
+                    //         "y": 31.188890418122178,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30488549898331,
+                    //         "y": 31.18841532634147,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30489353090678,
+                    //         "y": 31.187841598865855,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30487462397232,
+                    //         "y": 31.187226940195103,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30467806077046,
+                    //         "y": 31.187033387433935,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30391173448861,
+                    //         "y": 31.18654998998803,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.3031354194004,
+                    //         "y": 31.186067600959273,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30162566409005,
+                    //         "y": 31.18515069662575,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29858007896227,
+                    //         "y": 31.183287832294678,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29577137421792,
+                    //         "y": 31.186824696355163,
+                    //         "z": 0
+                    //     },
+                    // ],
                 ]
                 //高德转84
                 //     let sz = [
@@ -323,102 +323,102 @@ export default {
                         { x: 121.35374042236845, y: 31.182090361752536, z: 0 },
                         { x: 121.36194587932806, y: 31.16013705465239, z: 0 },
                     ],
-                    [{
-                            "x": 121.29577137421792,
-                            "y": 31.186824696355163,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29418329761764,
-                            "y": 31.18872030124066,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29280475525546,
-                            "y": 31.190723474492756,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29005251449192,
-                            "y": 31.194744686426272,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29837921625169,
-                            "y": 31.198135776426472,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29990431690115,
-                            "y": 31.195743378525012,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.3017996230984,
-                            "y": 31.19308143590054,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30362101641953,
-                            "y": 31.190462548748194,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30470085312731,
-                            "y": 31.188890418122178,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30488549898331,
-                            "y": 31.18841532634147,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30489353090678,
-                            "y": 31.187841598865855,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30487462397232,
-                            "y": 31.187226940195103,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30467806077046,
-                            "y": 31.187033387433935,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30391173448861,
-                            "y": 31.18654998998803,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.3031354194004,
-                            "y": 31.186067600959273,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.30162566409005,
-                            "y": 31.18515069662575,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29858007896227,
-                            "y": 31.183287832294678,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29577137421792,
-                            "y": 31.186824696355163,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.29577137421792,
-                            "y": 31.186824696355163,
-                            "z": 0
-                        },
-                    ],
+                    // [{
+                    //         "x": 121.29577137421792,
+                    //         "y": 31.186824696355163,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29418329761764,
+                    //         "y": 31.18872030124066,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29280475525546,
+                    //         "y": 31.190723474492756,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29005251449192,
+                    //         "y": 31.194744686426272,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29837921625169,
+                    //         "y": 31.198135776426472,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29990431690115,
+                    //         "y": 31.195743378525012,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.3017996230984,
+                    //         "y": 31.19308143590054,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30362101641953,
+                    //         "y": 31.190462548748194,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30470085312731,
+                    //         "y": 31.188890418122178,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30488549898331,
+                    //         "y": 31.18841532634147,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30489353090678,
+                    //         "y": 31.187841598865855,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30487462397232,
+                    //         "y": 31.187226940195103,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30467806077046,
+                    //         "y": 31.187033387433935,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30391173448861,
+                    //         "y": 31.18654998998803,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.3031354194004,
+                    //         "y": 31.186067600959273,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.30162566409005,
+                    //         "y": 31.18515069662575,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29858007896227,
+                    //         "y": 31.183287832294678,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29577137421792,
+                    //         "y": 31.186824696355163,
+                    //         "z": 0
+                    //     },
+                    //     {
+                    //         "x": 121.29577137421792,
+                    //         "y": 31.186824696355163,
+                    //         "z": 0
+                    //     },
+                    // ],
 
 
 
@@ -1406,7 +1406,7 @@ export default {
                 let options = {
                     isZoom: false,
                     style: {
-                        color: i == 0 ? "red" : i == 1 ? "orange" : "",
+                        color: i == 0 ? "red" : i == 1 ? "" : "",
                         transparency: 1,
                         outline: true,
                         outlineColor: 'transparent',
@@ -2499,7 +2499,7 @@ export default {
                                         ["单位名称：", val.attrbutes.facilityName, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
-                                        ["隐患问题：", msgParse.test1, 24],
+                                        // ["隐患问题：", msgParse.test1, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -2513,7 +2513,7 @@ export default {
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
                                         ["描述：", msgParse.test1, 24],
-                                        ["隐患问题：", msgParse.test2, 24],
+                                        // ["隐患问题：", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -2743,9 +2743,105 @@ export default {
                                                 //     ["隐患等级：", val.attrbutes.address, 24],
                                                 ["风险等级：", msgParse.test112, 12],
 
-                                                ["隐患问题1：", msgParse.test10=='有此类问题'?'灭火器等灭火器材是否保持完好有效':'', 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],
 
 
                                             ],

src/components/unitBox/index.vue

@@ -42,11 +42,18 @@
             <!-- <el-table-column align="left" label="设施类型"  prop="facilityType"></el-table-column> -->
             <el-table-column align="left" label="地址" prop="address" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="所属街镇" prop="streetTown" show-overflow-tooltip></el-table-column>
-            <!-- <el-table-column align="left" label="隐患问题" prop="extendData" show-overflow-tooltip>
+            <el-table-column align="left" label="手机号码" prop="contactPhone" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="床位号" prop="extendData" show-overflow-tooltip>
                 <template #default="scope">
                         {{JSON.parse(scope.row.extendData).test1}}
                 </template>
-            </el-table-column> -->
+            </el-table-column>
+            <el-table-column align="left" label="重点单位" prop="extendData" show-overflow-tooltip>
+                <template #default="scope">
+                        {{JSON.parse(scope.row.extendData).test2}}
+                </template>
+            </el-table-column>
+            
           
         </el-table>
     </div>
@@ -65,7 +72,7 @@
                      @click="staticsPoint(item.streetTown)">
                         <div style="padding: 0.2rem 0; text-align: center">
                             <span style="display: block">
-                                <Strong :style="{ color: item.color, fontSize: '0.3rem'}" >
+                                <Strong style="color:rgb(1, 224, 255) " :style="{ fontSize: '0.3rem'}" >
                                     <CountTo :startVal='0' :endVal='item.count || 0' :duration='3000'>{{ item.count || 0 }}</CountTo>
                                 </Strong>
                                 家

src/views/security-plan.vue

@@ -150,7 +150,7 @@
                               v-for="(item,index) in staticData.array1" :key="index" @click="goPoints(item.facilityType)">
                                 <div style="padding: 0.2rem 0; text-align: center;user-select:none !important">
                                     <span style="display: block">
-                                        <Strong :style="{ color: item.color, fontSize: '0.3rem'}" >
+                                        <Strong style="color:rgb(1, 224, 255)" :style="{ fontSize: '0.3rem'}" >
                                             <CountTo :startVal='0' :endVal='item.count || 0' :duration='3000'>{{ item.count || 0 }}</CountTo>
                                         </Strong>
                                         家
@@ -440,7 +440,7 @@
                             :empty-text="dataNo2"
                             
                             >
-                            <el-table-column prop="id" label="网格编号"  min-width="0" show-overflow-tooltip/>
+                            <el-table-column prop="id" label="网格编号"  min-width="25" show-overflow-tooltip/>
                             <el-table-column prop="count1" label="检查家数"  min-width="20" show-overflow-tooltip/>
                             <el-table-column prop="count2" label="发现隐患数"  min-width="20" show-overflow-tooltip/>
                             <el-table-column prop="count3" label="整改隐患"  min-width="20" show-overflow-tooltip/>
@@ -463,14 +463,14 @@
                             <el-col :span="4" style="color:red" @click="djActiveClick(0)">高风险<br>0（家）</el-col>
                             <el-col :span="4" style="color:orange" @click="djActiveClick(1)">较高风险<br>9（家）</el-col>
                             <el-col :span="4" style="color:yellow" @click="djActiveClick(2)">一般风险<br>15（家）</el-col>
-                            <el-col :span="4" style="color:green" @click="djActiveClick(3)">低风险<br>152（家）</el-col>
+                            <el-col :span="4" style="color:rgb(1, 224, 255)" @click="djActiveClick(3)">低风险<br>152（家）</el-col>
                         </el-row>
                         <el-row class="row_g2">
                             <el-col :span="8">九小场所</el-col>
                             <el-col :span="4"  style="color:red" @click="basicStaticsData(39,'高风险')" >高风险<br>{{jxcstj[0]}}（家）</el-col>
                             <el-col :span="4" style="color:orange" @click="basicStaticsData(39,'较高风险')" >较高风险<br>{{jxcstj[1]}}（家）</el-col>
                             <el-col :span="4" style="color:yellow" @click="basicStaticsData(39,'一般风险')">一般风险<br>{{jxcstj[2]}}（家）</el-col>
-                            <el-col :span="4" style="color:green" @click="basicStaticsData(39,'低风险')">低风险<br>{{jxcstj[3]}}（家）</el-col>
+                            <el-col :span="4" style="color:rgb(1, 224, 255)" @click="basicStaticsData(39,'低风险')">低风险<br>{{jxcstj[3]}}（家）</el-col>
                         </el-row>
 
                     </div>
@@ -1072,31 +1072,31 @@ export default {
             dialogTableVisible:false,
             pdfUrl:'',
             dailyArray:[{
-                    title: '第七期 第六届中国国际进口博览会每日工作动态',
+                    title: '第七期：  第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231031.pdf',
                 },
                 {
-                    title: '第六期 第六届中国国际进口博览会每日工作动态',
+                    title: '第六期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231030.pdf',
                 },
                 {
-                    title: '第五期 第六届中国国际进口博览会每日工作动态',
+                    title: '第五期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231027.pdf',
                 },
                 {
-                    title: '第四期 第六届中国国际进口博览会每日工作动态',
+                    title: '第四期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231026.pdf',
                 },
                 {
-                    title: '第三期 第六届中国国际进口博览会每日工作动态',
+                    title: '第三期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231025.pdf',
                 },
                 {
-                    title: '第二期 第六届中国国际进口博览会每日工作动态',
+                    title: '第二期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231024.pdf',
                 },
                 {
-                    title: '第一期 第六届中国国际进口博览会每日工作动态',
+                    title: '第一期： 第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231023.pdf',
                 },
             ],
@@ -1402,7 +1402,7 @@ export default {
                 {
                     "name": "沿街门面",
                     "count": 3080,
-                    "value":1  //?
+                    "value":39  //?
                 },
                 // {
                 //     "name": "办公楼宇",
@@ -1846,24 +1846,39 @@ export default {
         this.basicStaticsData(39)
         // this.llbutj()//力量部署统计
 
-        this.staticsSd()  // 疏导区基本情况统计
+        // this.staticsSd()  // 疏导区基本情况统计
 
         
     },
     methods: {
 
        
-        async staticsSd(id,grideGrade){
+        async staticsSd(name,grideGrade,mapGridName){
             let res = await this.$axios.get(
                 this.$api.security.gridMemderStatistic +
                     "?" +
                     this.$qs.stringify({
-                        id: id,
-                        gridGrade:grideGrade
+                        gridArea: name,
+                        gridGrade:grideGrade,
+                        mapGridName:mapGridName
                     })
             );
             if (res.data) {
-               console.log(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;//宾馆酒店
+               this.line3Array[3].count=res.data.scaleRentNum;//规模租赁
+               this.line3Array[4].count=res.data.factoryStoreNum;//厂房仓库
+               this.line3Array[5].count=res.data.medicalInstitutionNum;//医疗机构
+               this.line3Array[6].count=res.data.elderCareNum;//养老机构
+               this.line3Array[7].count=res.data.dealerMarketNum;//批发市场  ？？？
+               this.line3Array[8].count=res.data.schoolNum;//儿童福利机构
+               this.line3Array[9].count=res.data.streetFrontNum;//沿街门面
+               this.line3Array[10].count=res.data.villageNum;//居民小区
+               this.line3Array[11].count=res.data.subwayStationNum;//地铁站
+               
+
             }
                         
 
@@ -3210,23 +3225,17 @@ export default {
         "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);
             }
         },
-        "stores.$state.gridId": function (newValue, oldValue) {
-            
-            if (this.gridStatus == 15) {
-                this.staticsSd(newValue,2)
-                
-                // this.grid(15, newValue.name, newValue.position);
-            }
-            if (this.gridStatus == 16) {
-                // this.grid(16, newValue.name, newValue.position);
-            }
-        },
+
         "stores.$state.jkspData": function (newValue, oldValue) {
             this.jkspStatus = true
             this.Message.name = newValue.children[0][1]
@@ -3725,11 +3734,11 @@ export default {
            
             .dailyItem{
                 vertical-align: middle;
-                margin-left:1rem;
+                margin-left:.5rem;
                 margin-top:.2rem;   
                 line-height:.375rem;
                 font-size:.175rem;
-                width:58%;
+                width:80%;
                 height:60%;
                 overflow-y:hidden;
                 display: inline-block;

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月15日</p>
+            <p>安保阶段：2023年10月23日——11月25日</p>
         </el-row>
     </el-row>
 </template>