瀏覽代碼

根据文档需求调整代码

ming 1 年之前
父節點
當前提交
9eaf0888ba
共有 5 個文件被更改,包括 485 次插入175 次删除
  1. 336 150
      src/components/mixins/map-data1.js
  2. 2 2
      src/components/unitBox/index.vue
  3. 3 0
      src/http/api.js
  4. 5 0
      src/store/modules/public.js
  5. 139 23
      src/views/security-plan.vue

+ 336 - 150
src/components/mixins/map-data1.js

@@ -294,7 +294,6 @@ export default {
          * 疏导区网格
          */
         anbaoSDUWG2() {
-
             // arr["疏导区","核心区","新虹","虹桥","七宝","疏导区","疏导区","疏导区","疏导区","疏导区","疏导区"]
             let arr = [
                     [
@@ -420,7 +419,11 @@ export default {
                             "z": 0
                         },
                     ],
-                    [{
+
+
+
+                    [
+                        {
                             "x": 121.30273636473034,
                             "y": 31.2198977980581,
                             "z": 0
@@ -471,58 +474,58 @@ export default {
                             "z": 0
                         },
                         {
-                            "x": 121.31925691122792,
-                            "y": 31.17245465391409,
+                            "x": 121.32021232990239,
+                            "y": 31.165523391487618,
                             "z": 0
                         },
                         {
-                            "x": 121.32390048093693,
-                            "y": 31.170568716589433,
+                            "x": 121.32327025205065,
+                            "y": 31.166697919079528,
                             "z": 0
                         },
                         {
-                            "x": 121.32616056996633,
-                            "y": 31.167764822098988,
+                            "x": 121.32598297930888,
+                            "y": 31.167707192311653,
                             "z": 0
                         },
                         {
-                            "x": 121.33127182948746,
-                            "y": 31.169693074849317,
+                            "x": 121.3300506385267,
+                            "y": 31.169020740661125,
                             "z": 0
                         },
                         {
-                            "x": 121.3354384069199,
-                            "y": 31.17126742825148,
+                            "x": 121.33308074478083,
+                            "y": 31.170063465083643,
                             "z": 0
                         },
                         {
-                            "x": 121.33714887246975,
-                            "y": 31.168692577494745,
+                            "x": 121.33680936261949,
+                            "y": 31.171617702586946,
                             "z": 0
                         },
                         {
-                            "x": 121.3403344015155,
-                            "y": 31.163862248714743,
+                            "x": 121.34048325971816,
+                            "y": 31.173395072767924,
                             "z": 0
                         },
                         {
-                            "x": 121.34528486521597,
-                            "y": 31.16583845246894,
+                            "x": 121.34466128113863,
+                            "y": 31.175826411549046,
                             "z": 0
                         },
                         {
-                            "x": 121.35120094247694,
-                            "y": 31.16826127346991,
+                            "x": 121.34680172579147,
+                            "y": 31.178084570251936,
                             "z": 0
                         },
                         {
-                            "x": 121.35749722559409,
-                            "y": 31.17110007381761,
+                            "x": 121.34924065839658,
+                            "y": 31.180659159836306,
                             "z": 0
                         },
                         {
-                            "x": 121.35512965416443,
-                            "y": 31.179768207777574,
+                            "x": 121.35155897314478,
+                            "y": 31.183120124957217,
                             "z": 0
                         },
                         {
@@ -541,58 +544,143 @@ export default {
                             "z": 0
                         },
                         {
-                            "x": 121.33742914963742,
-                            "y": 31.181555501135435,
+                            "x": 121.34034973522476,
+                            "y": 31.18276355759052,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.34054662853494,
+                            "y": 31.179132037709795,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.33909084322825,
+                            "y": 31.178090208384628,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.33314119209962,
+                            "y": 31.17490687176414,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.32941417430312,
+                            "y": 31.179490607061364,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.32333640531293,
+                            "y": 31.186409761742077,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31979648437033,
+                            "y": 31.186390560209034,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31738599140147,
+                            "y": 31.186119299689175,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31545335103003,
+                            "y": 31.1863198699811,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31463098432755,
+                            "y": 31.188906130945444,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31431524665976,
+                            "y": 31.19413312743748,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31392084880497,
+                            "y": 31.197453231022397,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.3138178987657,
+                            "y": 31.199566385917507,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31363405394123,
+                            "y": 31.202569261791034,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31764297148717,
+                            "y": 31.202833538445923,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.31990280085519,
+                            "y": 31.203149067137048,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.32001444032777,
+                            "y": 31.204381252944586,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.32102414686388,
+                            "y": 31.204267373736055,
                             "z": 0
                         },
                         {
-                            "x": 121.33725368441635,
-                            "y": 31.179798713266624,
+                            "x": 121.32104219933838,
+                            "y": 31.203178869593827,
                             "z": 0
                         },
                         {
-                            "x": 121.33674866036101,
-                            "y": 31.181289892310865,
+                            "x": 121.32184238032998,
+                            "y": 31.20309237706465,
                             "z": 0
                         },
                         {
-                            "x": 121.332501016653,
-                            "y": 31.181933513222692,
+                            "x": 121.322094760899,
+                            "y": 31.203594647870148,
                             "z": 0
                         },
                         {
-                            "x": 121.32672712369686,
-                            "y": 31.192809064312954,
+                            "x": 121.3226091714,
+                            "y": 31.20841432102124,
                             "z": 0
                         },
                         {
-                            "x": 121.33390476125636,
-                            "y": 31.194946367619707,
+                            "x": 121.32268284017493,
+                            "y": 31.21030726609188,
                             "z": 0
                         },
                         {
-                            "x": 121.33439003374988,
-                            "y": 31.214038166797163,
+                            "x": 121.32279333780582,
+                            "y": 31.213210658762776,
                             "z": 0
                         },
                         {
-                            "x": 121.33549657393999,
-                            "y": 31.21415804204388,
+                            "x": 121.32585032720966,
+                            "y": 31.213614598023238,
                             "z": 0
                         },
                         {
-                            "x": 121.3354385349542,
-                            "y": 31.21609122683711,
+                            "x": 121.3262044044869,
+                            "y": 31.214960275369684,
                             "z": 0
                         },
                         {
-                            "x": 121.33450141290005,
-                            "y": 31.21836189705601,
+                            "x": 121.32735850706635,
+                            "y": 31.21810256739113,
                             "z": 0
                         },
                         {
-                            "x": 121.33784500531124,
-                            "y": 31.219012381734945,
+                            "x": 121.33797261480862,
+                            "y": 31.220316529430825,
                             "z": 0
                         },
                         {
@@ -636,82 +724,119 @@ export default {
                             "z": 0
                         }
                     ],
-                    [{
-                            "x": 121.35379785226752,
-                            "y": 31.159300786342637,
+                    [
+                        {
+                            "x": 121.38174498715762,
+                            "y": 31.19511837909824,
                             "z": 0
                         },
                         {
-                            "x": 121.35868617827254,
-                            "y": 31.159720227812123,
+                            "x": 121.37439321990384,
+                            "y": 31.19164505085419,
                             "z": 0
                         },
                         {
-                            "x": 121.36215949997082,
-                            "y": 31.15969540722189,
+                            "x": 121.36613991412135,
+                            "y": 31.18949109670517,
                             "z": 0
                         },
                         {
-                            "x": 121.3614223065673,
-                            "y": 31.163905217450328,
+                            "x": 121.35889444445836,
+                            "y": 31.187168900604735,
                             "z": 0
                         },
                         {
-                            "x": 121.35761905377441,
-                            "y": 31.17065412368764,
+                            "x": 121.35433048552062,
+                            "y": 31.186882854368413,
                             "z": 0
                         },
                         {
-                            "x": 121.3515233621259,
-                            "y": 31.16787295256606,
+                            "x": 121.35338835737089,
+                            "y": 31.18525813859992,
                             "z": 0
                         },
                         {
-                            "x": 121.35190868564712,
-                            "y": 31.167252652709518,
+                            "x": 121.3539666918386,
+                            "y": 31.180646558198628,
                             "z": 0
                         },
                         {
-                            "x": 121.35248467261219,
-                            "y": 31.16643115648518,
+                            "x": 121.35630692835977,
+                            "y": 31.175456614552886,
                             "z": 0
                         },
                         {
-                            "x": 121.35260055257123,
-                            "y": 31.165311550786598,
+                            "x": 121.3580203260968,
+                            "y": 31.171087314800047,
                             "z": 0
                         },
                         {
-                            "x": 121.35264451648362,
-                            "y": 31.164778756595926,
+                            "x": 121.36006284227716,
+                            "y": 31.17166809725174,
                             "z": 0
                         },
                         {
-                            "x": 121.35257069903504,
-                            "y": 31.164266139223166,
+                            "x": 121.36499896344895,
+                            "y": 31.173513581113085,
                             "z": 0
                         },
                         {
-                            "x": 121.3527395933964,
-                            "y": 31.161840129615992,
+                            "x": 121.37220805206849,
+                            "y": 31.176487825626406,
                             "z": 0
                         },
                         {
-                            "x": 121.35261594211822,
-                            "y": 31.160483031631124,
+                            "x": 121.37606965804888,
+                            "y": 31.17752261481413,
                             "z": 0
                         },
                         {
-                            "x": 121.35303028598638,
-                            "y": 31.15913507784978,
+                            "x": 121.38110091892068,
+                            "y": 31.178784996932073,
                             "z": 0
-                        }
-                    ],
-                    [{
-                            "x": 121.31381416174536,
-                            "y": 31.173294561163896,
+                        },
+                        {
+                            "x": 121.38324725407509,
+                            "y": 31.179266352750226,
                             "z": 0
                         },
+                        {
+                            "x": 121.38653905301372,
+                            "y": 31.180825773329694,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.38860193242203,
+                            "y": 31.181902333221167,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.39021721760226,
+                            "y": 31.18256042301469,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.38858245011984,
+                            "y": 31.187540507773953,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.38738975903269,
+                            "y": 31.190531512696225,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.38579439220923,
+                            "y": 31.19325491705978,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.38375142191722,
+                            "y": 31.19628753840775,
+                            "z": 0
+                        }
+                    ],
+                    [
                         {
                             "x": 121.31893528098777,
                             "y": 31.16503208910045,
@@ -813,8 +938,8 @@ export default {
                             "z": 0
                         },
                         {
-                            "x": 121.34550413532479,
-                            "y": 31.15753438865423,
+                            "x": 121.34400529541412,
+                            "y": 31.156640467170416,
                             "z": 0
                         },
                         {
@@ -823,58 +948,53 @@ export default {
                             "z": 0
                         },
                         {
-                            "x": 121.349876341794,
-                            "y": 31.158456520738092,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.35269990799088,
-                            "y": 31.159064637430497,
+                            "x": 121.35303028598638,
+                            "y": 31.15913507784978,
                             "z": 0
                         },
                         {
-                            "x": 121.35239139069755,
-                            "y": 31.16016255568717,
+                            "x": 121.3557772622189,
+                            "y": 31.159377702560327,
                             "z": 0
                         },
                         {
-                            "x": 121.35251902666961,
-                            "y": 31.161601603806915,
+                            "x": 121.36231823143812,
+                            "y": 31.15991008259538,
                             "z": 0
                         },
                         {
-                            "x": 121.35243288542387,
-                            "y": 31.165095928962824,
+                            "x": 121.3580203260968,
+                            "y": 31.171087314800047,
                             "z": 0
                         },
                         {
-                            "x": 121.35237092238553,
-                            "y": 31.166011554330634,
+                            "x": 121.35309494546975,
+                            "y": 31.1847508552549,
                             "z": 0
                         },
                         {
-                            "x": 121.3519037161686,
-                            "y": 31.167008786470195,
+                            "x": 121.34924065839658,
+                            "y": 31.180659159836306,
                             "z": 0
                         },
                         {
-                            "x": 121.3478587161376,
-                            "y": 31.165302327392354,
+                            "x": 121.34466128113863,
+                            "y": 31.175826411549046,
                             "z": 0
                         },
                         {
-                            "x": 121.34094326123495,
-                            "y": 31.162030100817073,
+                            "x": 121.33920506685429,
+                            "y": 31.172650772923458,
                             "z": 0
                         },
                         {
-                            "x": 121.33697029395886,
-                            "y": 31.16833309250413,
+                            "x": 121.33680936261949,
+                            "y": 31.171617702586946,
                             "z": 0
                         },
                         {
-                            "x": 121.33526482912758,
-                            "y": 31.170815983506582,
+                            "x": 121.33512811869265,
+                            "y": 31.170961164133587,
                             "z": 0
                         },
                         {
@@ -886,21 +1006,12 @@ export default {
                             "x": 121.32544322389143,
                             "y": 31.16753331721317,
                             "z": 0
-                        },
-                        {
-                            "x": 121.32384068400313,
-                            "y": 31.16979422919267,
-                            "z": 0
-                        },
-                        {
-                            "x": 121.31831508397927,
-                            "y": 31.172109630126858,
-                            "z": 0
                         }
                     ],
-                    [{
-                            "x": 121.23756418907722,
-                            "y": 31.25204958351479,
+                    [
+                        {
+                            "x": 121.23894863914936,
+                            "y": 31.249875913167497,
                             "z": 0
                         },
                         {
@@ -1189,44 +1300,93 @@ export default {
                             "z": 0
                         },
                         {
-                            "x": 121.25351513097648,
-                            "y": 31.25294996585441,
+                            "x": 121.25817693706111,
+                            "y": 31.259255314400082,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.25142033245574,
+                            "y": 31.26107797628681,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.25015676486815,
+                            "y": 31.261234177326084,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24981792108898,
+                            "y": 31.260662487956385,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24995292056721,
+                            "y": 31.260169678541565,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24947810024433,
+                            "y": 31.25976493684194,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24907724049469,
+                            "y": 31.2594681287784,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.2483554505827,
+                            "y": 31.25922633134769,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24741971242636,
+                            "y": 31.258638684494407,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.2466108721453,
+                            "y": 31.25855377804927,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24632796342395,
+                            "y": 31.258027022497195,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24572604031508,
+                            "y": 31.258152986704957,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24421829550096,
+                            "y": 31.25691251870397,
+                            "z": 0
+                        },
+                        {
+                            "x": 121.24296550612725,
+                            "y": 31.255009280533766,
                             "z": 0
                         },
                         {
-                            "x": 121.24481469452851,
-                            "y": 31.251644860116766,
+                            "x": 121.24175865031702,
+                            "y": 31.253105992330642,
                             "z": 0
                         }
                     ]
 
                 ]
                 //高德转84
-                //     let sz = [
-                //         [121.30025, 31.184825],
-                //         [121.298659, 31.186719],
-                //         [121.297278, 31.188721],
-                //         [121.294521, 31.19274],
-                //         [121.302864, 31.196146],
-                //         [121.304392, 31.193755],
-                //         [121.306291, 31.191095],
-                //         [121.308116, 31.188478],
-                //         [121.309198, 31.186907],
-                //         [121.309383, 31.186432],
-                //         [121.309391, 31.185858],
-                //         [121.309372, 31.185243],
-                //         [121.309175, 31.185049],
-                //         [121.308407, 31.184564],
-                //         [121.307629, 31.18408],
-                //         [121.306116, 31.18316],
-                //         [121.303064, 31.181291]
-                //     ]
-                //     let result = {}
-                //     for (let i = 0; i < sz.length; i++) {
-                //         result = CoordUtil.gcj02towgs84(sz[i][0], sz[i][1]);
-                //         arr[1].push({ x: result[0], y: result[1], z: 0 })
-                //     }
-                //     console.log(111, arr)
+                    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)
             for (let i = 0; i < arr.length; i++) {
                 let target = {
                     id: i,
@@ -1468,6 +1628,7 @@ export default {
                                 function regionLocateCallBack(obj) {
                                     console.log(obj)
                                     that.stores.gridDataChange(obj._attributes);
+                                    that.stores.gridDataChange1(obj._id);
                                 }
 
                             }, idx * 1)
@@ -2578,10 +2739,15 @@ export default {
                                                 ["单位使用性质:", msgParse.test4, 12],
                                                 ["建筑性质:", msgParse.test8, 12],
                                                 ["建筑结构:", msgParse.test9, 12],
-                                                ["隐患扣分:", msgParse.test111, 12],
+                                                // ["隐患扣分:", msgParse.test111, 12],
                                                 //     ["隐患等级:", val.attrbutes.address, 24],
                                                 ["风险等级:", msgParse.test112, 12],
 
+                                                ["隐患问题1:", msgParse.test10=='有此类问题'?'灭火器等灭火器材是否保持完好有效':'', 12],
+                                                ["具体情形:", msgParse.test10=='有此类问题'? msgParse.test11:'', 12],
+                                                ["整改情况:", msgParse.test10=='有此类问题'? msgParse.test12:'', 12],
+
+
                                             ],
                                         }, ];
                                         this.popup(val._attrbutes, arrayList, true)
@@ -2616,6 +2782,26 @@ export default {
 
                             }
                             //疏导区基本情况----------------------
+                            if (type == "消防安全重点单位") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称:", val.attrbutes.facilityName, 24],
+                                        ["街镇:", val.attrbutes.streetTown, 24],
+                                        ["地址:", val.attrbutes.address, 24],
+                                        ["联系人:", val.attrbutes.contact, 24],
+                                        ["联系电话:", val.attrbutes.contactPhone, 24],
+                                        ["消防安全责任人:", msgParse.test1, 24],
+                                        ["消防安全责任人电话:", msgParse.test2, 24],
+                                        ["消防安全管理人:", msgParse.test3, 24],
+                                        ["消防安全管理人电话:", msgParse.test4, 24],
+                                        ["法定代表人:", msgParse.test5, 24],
+                                        ["法人联系电话:", msgParse.test6, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
                             if (type == "学校") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{

+ 2 - 2
src/components/unitBox/index.vue

@@ -42,11 +42,11 @@
             <!-- <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="extendData" show-overflow-tooltip>
                 <template #default="scope">
                         {{JSON.parse(scope.row.extendData).test1}}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
           
         </el-table>
     </div>

+ 3 - 0
src/http/api.js

@@ -61,6 +61,9 @@ let api = {
         baseGgpFacilityList: "/prod-api/service-fire/baseGgpFacility/baseGgpFacilityList", //消防水源撒点
         baseGgpFacilityStatistic: "/prod-api/service-fire/baseGgpFacility/statistic", //统计
     },
+    security: {
+        gridMemderStatistic: "/prod-api/service-fire/demGridMemderStatistic/gridMemderStatistic", //统计
+    },
     house: {
         //警情综合处置
         alertStatisticsByHouse: "/api/alert/alertStatisticsByHouse",

+ 5 - 0
src/store/modules/public.js

@@ -206,6 +206,7 @@ const useStore = defineStore("public", {
         xfzfdt: {}, //执法记录仪
         arrayList: [], //撒点弹框数据存储,
         gridData: {},
+        gridId: {},
         jkspData: {}, //监控视频数据
     }),
     actions: {
@@ -213,6 +214,10 @@ const useStore = defineStore("public", {
             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)

+ 139 - 23
src/views/security-plan.vue

@@ -434,13 +434,13 @@
                             >
                         </div>
                     </div>
-                        <el-table :data="tableData111" 
+                        <el-table :data="tableDataGrid" 
                             class="transparentTableRow"
                             height="57%"
                             :empty-text="dataNo2"
                             
                             >
-                            <el-table-column prop="id" label="网格编号"  min-width="20" show-overflow-tooltip/>
+                            <el-table-column prop="id" label="网格编号"  min-width="0" 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/>
@@ -1068,7 +1068,7 @@ export default {
                 tk:false,
                 tkData: {},//消防安全重点单位弹框数据
             jxcstj:[0,0,0,0],//九小场所统计
-            check: 1,
+            check: '1',
             dialogTableVisible:false,
             pdfUrl:'',
             dailyArray:[{
@@ -1100,30 +1100,107 @@ export default {
                     url: 'http://32.0.15.107:8080/mhvi/20231023.pdf',
                 },
             ],
-            tableData111:[{
+
+            // 大中网格数据渲染 start
+            tableDataGrid:[],
+            tableDataBigGrid:[{
                     id: '闵S1(华漕网格)',
-                    count1: '1127',
-                    count2: '250',
-                    count3: '250',
+                    count1: '1319',
+                    count2: '486',
+                    count3: '344',
                 },
                 {
                     id: '闵S2(新虹网格)',
-                    count1: '1242',
-                    count2: '169',
-                    count3: '169',
+                    count1: '1612',
+                    count2: '563',
+                    count3: '490',
                 },
                 {
                     id: '闵S3(七宝网格)',
-                    count1: '1187',
-                    count2: '173',
-                    count3: '173',
+                    count1: '1525',
+                    count2: '484',
+                    count3: '389',
                 },
                 {
                     id: '闵S4(虹桥网格)',
-                    count1: '1002',
-                    count2: '155',
-                    count3: '155',
-                }],
+                    count1: '1360',
+                    count2: '566',
+                    count3: '392',
+            }],
+            tableDataMiddleGrid:[{
+                    id: '闵S1-1(华漕网格)',
+                    count1: '207',
+                    count2: '88',
+                    count3: '64',
+                },
+                {
+                    id: '闵S1-2(华漕网格)',
+                    count1: '134',
+                    count2: '52',
+                    count3: '40',
+                },
+                {
+                    id: '闵S1-3(华漕网格)',
+                    count1: '157',
+                    count2: '57',
+                    count3: '38',
+                },{
+                    id: '闵S1-4(华漕网格)',
+                    count1: '523',
+                    count2: '192',
+                    count3: '126',
+                },{
+                    id: '闵S1-5(华漕网格)',
+                    count1: '253',
+                    count2: '83',
+                    count3: '66',
+                },{
+                    id: '闵S2-1(新虹网格)',
+                    count1: '565',
+                    count2: '127',
+                    count3: '83',
+                },{
+                    id: '闵S2-2(新虹网格)',
+                    count1: '225',
+                    count2: '111',
+                    count3: '104',
+                },{
+                    id: '闵S2-3(新虹网格)',
+                    count1: '395',
+                    count2: '78',
+                    count3: '76',
+                },{
+                    id: '闵S2-4(新虹网格)',
+                    count1: '425',
+                    count2: '253',
+                    count3: '196',
+                },{
+                    id: '闵S3-1(七宝网格)',
+                    count1: '394',
+                    count2: '158',
+                    count3: '105',
+                },{
+                    id: '闵S3-2(七宝网格)',
+                    count1: '158',
+                    count2: '48',
+                    count3: '34',
+                },{
+                    id: '闵S3-3(七宝网格)',
+                    count1: '298',
+                    count2: '303',
+                    count3: '129',
+                },{
+                     id: '闵S4-1(虹桥网格)',
+                    count1: '873',
+                    count2: '346',
+                    count3: '272',
+                },{ id: '闵S4-2(虹桥网格)',
+                    count1: '467',
+                    count2: '124',
+                    count3: '114',
+                }],
+
+
             tableDataBasic:[
             {
                 date: '2016-05-03',
@@ -1261,7 +1338,7 @@ export default {
                 {
                     "name": "消防安全重点单位",
                     "count": 176,
-                    "value":0
+                    "value":40
                 },
                 {
                     "name": "大型商业综合体",
@@ -1318,9 +1395,9 @@ export default {
                     "value": '27',
                 },
                 {
-                    "name": '学校',
-                    "count": 23,
-                    "value": '37',
+                    "name": '儿童福利机构',
+                    "count": 1,
+                    "value": '41',
                 },
                 {
                     "name": "沿街门面",
@@ -1751,6 +1828,7 @@ export default {
     mounted() {
         this.gridStatisticsData()//处置网格数据
         this.grid(15);
+        this.tableDataGrid=this.tableDataBigGrid;
         setTimeout(() => {
             this.autoScroll();
         });
@@ -1768,9 +1846,28 @@ export default {
         this.basicStaticsData(39)
         // this.llbutj()//力量部署统计
 
+        this.staticsSd()  // 疏导区基本情况统计
+
         
     },
     methods: {
+
+       
+        async staticsSd(id,grideGrade){
+            let res = await this.$axios.get(
+                this.$api.security.gridMemderStatistic +
+                    "?" +
+                    this.$qs.stringify({
+                        id: id,
+                        gridGrade:grideGrade
+                    })
+            );
+            if (res.data) {
+               console.log(res.data)
+            }
+                        
+
+        },
         
         /**
          * @消防安全重点单位撒点详情
@@ -1805,6 +1902,14 @@ export default {
 
         btnC(val) {
             this.check = val;
+            if(val==2){
+                this.tableDataGrid=this.tableDataMiddleGrid
+            }else{
+                this.tableDataGrid=this.tableDataBigGrid
+
+            }
+            
+
         },
         /**
          * 视频关闭
@@ -1841,8 +1946,8 @@ export default {
                         type: "wgmc_qb",
                     },
                     {
-                        gisX: 121.357666,
-                        gisY: 31.165440,
+                        gisX: 121.37880329777738,   
+                        gisY: 31.185610251208278,
                         type: "wgmc_hq",
                     },
                     {
@@ -3111,6 +3216,17 @@ export default {
                 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]