疏导区网格

src/components/mixins/map-data1.js

@@ -103,6 +103,95 @@ export default {
 
 
 
+        },
+        /**
+         * 疏导区网格
+         */
+        anbaoSDUWG(){
+            console.log(1111)
+            let arr = [
+                [
+                    {x:121.36194587932806,y:31.16013705465239,z:0},
+                    {x:121.34727553811794,y:31.15828077299882,z:0},
+                    {x:121.32700411033827,y:31.148247489434965,z:0},
+                    {x:121.31514606604391,y:31.139440444833916,z:0},
+                    {x:121.30048786370499,y:31.134903156770502,z:0},
+                    {x:121.29284839062778,y:31.12773298212305,z:0},
+                    {x:121.28484794201171,y:31.12306873887283,z:0},
+                    {x:121.2434981967536,y:31.119911283997425,z:0},
+                    {x:121.22295978253271,y:31.11453182095247,z:0},
+                    {x:121.22093534994545,y:31.128184924119704,z:0},
+                    {x:121.22476714240756,y:31.137743873822444,z:0},
+                    {x:121.22284789103668,y:31.151848705517672,z:0},
+                    {x:121.2192245740552,y:31.185051824029983,z:0},
+                    {x:121.21634530262463,y:31.19305254070648,z:0},
+                    {x:121.21666410880577,y:31.199965150511076,z:0},
+                    {x:121.20802887999594,y:31.252419358825662,z:0},
+                    {x:121.2510308379889,y:31.25199056924825,z:0},
+                    {x:121.26975280768023,y:31.256161713215423,z:0},
+                    {x:121.29758483246128,y:31.25239812402721,z:0},
+                    {x:121.34774474510056,y:31.253635862387053,z:0},
+                    {x:121.34278143296902,y:31.239737181776324,z:0},
+                    {x:121.34412376809345,y:31.224709084528335,z:0},
+                    {x:121.35105449522602,y:31.20248989001769,z:0},
+                    {x:121.35374042236845,y:31.182090361752536,z:0},
+                    {x:121.36194587932806,y:31.16013705465239,z:0},
+                ],
+                [
+                    {x:121.30025,y:31.184825,z:0},
+                    {x:121.298659,y:31.186719,z:0},
+                    {x:121.297278,y:31.188721,z:0},
+                    {x:121.294521,y:31.19274,z:0},
+                    {x:121.302864,y:31.196146,z:0},
+                    {x:121.304392,y:31.193755,z:0},
+                    {x:121.306291,y:31.191095,z:0},
+                    {x:121.308116,y:31.188478,z:0},
+                    {x:121.309198,y:31.186907,z:0},
+                    {x:121.309383,y:31.186432,z:0},
+                    {x:121.309391,y:31.185858,z:0},
+                    {x:121.309372,y:31.185243,z:0},
+                    {x:121.309175,y:31.185049,z:0},
+                    {x:121.308407,y:31.184564,z:0},
+                    {x:121.307629,y:31.18408,z:0},
+                    {x:121.306116,y:31.18316,z:0},
+                    {x:121.303064,y:31.181291,z:0},
+                    {x:121.30025,y:31.184825,z:0},
+                ]
+            ]
+            for(let i=0;i<arr.length;i++){
+                console.log(i)
+                let target = {
+                    id: i,
+                    attributes: {
+                        name: i,
+                    },
+                    position: arr[i],
+                    label: {
+                        text: i,
+                        font: "16px Helvetica",
+                        color: i ==0 ? "red" : "orange",
+                        pixelOffset: [0, -50],
+                        backgroundColor: "red"
+                    }
+    
+                }
+                let options = {
+                    isZoom: false,
+                    style: {
+                        color: i == 0 ? "red" : i == 1 ? "orange" : "",
+                        transparency: 1,
+                        outline: true,
+                        outlineColor: 'transparent',
+                        perPositionHeight: true
+    
+                    },
+                    // click: regionLocateCallBack111
+                };
+                setTimeout(() => {
+                    window.jMap.Locate.trackLocate(target, options);
+                }, 2000)
+                
+            }
         },
         /**
          * 安保区域
@@ -198,6 +287,7 @@ export default {
                                 )
                             }
                         }
+                        console.log(11111,arr)
                         for(let i=0;i<arr.length;i++){
                             let target = {
                                 id: i + 1,
@@ -1392,6 +1482,20 @@ export default {
                                 }, ];
                                 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],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
 
                             
                         }

src/views/security-plan.vue

@@ -370,18 +370,41 @@
                  <!-- 疏导区每日动态 start -->
                  <div class="dailyNewSec">
                     <h4 style="display: flex">疏导区每日动态</h4>
-                    <div class="dailyItem">
+                    <div class="dailyItem dailyItemLeft">
                         <el-row>
-                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
-                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                            <el-col>七宝镇党委书记杨维萍开展网格治理调研指导</el-col>
                         </el-row>
                         <el-row>
-                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
-                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                            <el-col>华漕镇开展“地毯式”安全生产大检查活动</el-col>
                         </el-row>
                         <el-row>
-                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
-                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                            <el-col>张雪松支队长带队到疏导区开展消防安全检查</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col>陈国清政委到指挥所检查指导</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col>总队召开进博会消防安保临战动员部署会</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col>支队召开第六届进博会消防安保警师大会</el-col>
+                        </el-row>
+                    </div>
+                    <div class="dailyItem dailyItemRight">
+                        <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>
+                        <el-row>
+                            <el-col></el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col>今日支队领导视察指挥中心</el-col>
                         </el-row>
                     </div>
                    
@@ -395,13 +418,13 @@
                     <div class="girdCheckItem">
                         <div class="row_g">
                             <div style="font-size:.175rem">累计:</div>
-                            <div >检查家数<br>100（家次）</div>
-                            <div >发现隐患数<br>51（处）</div>
-                            <div >整改隐患<br>48（处）</div>
-                            <div style="font-size:.175rem;margin-left:.125rem" >  当日:</div>
-                            <div >100家次</div>
-                            <div >20（处）</div>
-                            <div >20（处）</div>
+                            <div >检查家数<br>4558家次</div>
+                            <div >发现隐患数<br>747处</div>
+                            <div >整改隐患<br>747处</div>
+                            <div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
+                            <div >检查家数<br>125家次</div>
+                            <div >发现隐患数<br>46处</div>
+                            <div >整改隐患<br>46处</div>
                         </div>
                     </div>
                     <div style="display: flex">
@@ -431,9 +454,7 @@
                             class="transparentTableRow"
                             height="57%"
                             :empty-text="dataNo2"
-                            ref="reportTable"
-                            @mouseenter="autoScroll(true)"
-                            @mouseleave="autoScroll()"
+                            
                             >
                             <el-table-column prop="id" label="网格编号"  min-width="20" show-overflow-tooltip/>
                             <el-table-column prop="count1" label="检查家数"  min-width="20" show-overflow-tooltip/>
@@ -455,10 +476,10 @@
                     
                         <div class="row_g2">
                             <div >消防安全重点单位</div>
-                            <div style="color:red">高风险<br>151（家）</div>
-                            <div style="color:orange">较高风险<br>278（家）</div>
-                            <div style="color:yellow">一般风险<br>114（家）</div>
-                            <div style="color:green">低风险<br>4026（家）</div>
+                            <div style="color:red">高风险<br>2（家）</div>
+                            <div style="color:orange">较高风险<br>1（家）</div>
+                            <div style="color:yellow">一般风险<br>3（家）</div>
+                            <div style="color:green">低风险<br>170（家）</div>
                         </div>
                         <div class="row_g2">
                             <div >九小场所</div>
@@ -912,6 +933,10 @@
                 
             </el-row>
         </div>
+        <!-- pdf弹框 -->
+        <!-- <div class="pdf sadianTankang" >
+            <object :data="pdfUrl"></object>
+        </div> -->
     </el-row>
 </template>
 
@@ -949,17 +974,6 @@ export default {
                     count2: '173',
                     count3: '173',
                 },
-                {
-                    id: '闵S4(虹桥网格）',
-                    count1: '1002',
-                    count2: '155',
-                    count3: '155',
-                },{
-                    id: '闵S3(七宝网格）',
-                    count1: '1187',
-                    count2: '173',
-                    count3: '173',
-                },
                 {
                     id: '闵S4(虹桥网格）',
                     count1: '1002',
@@ -1181,8 +1195,8 @@ export default {
                 // },
                 {
                     "name": "居民小区",
-                    "count": 188,
-                    "value":2  //?
+                    "count": 194,
+                    "value":38  //?
                 },
                 
                 // {
@@ -1606,6 +1620,7 @@ export default {
         // this.sadianSelect(this.checkedArray.checkedData[0]);  //撒点
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
+        this.anbaoSDUWG()//疏导区网格
         // this.llbutj()//力量部署统计
 
         
@@ -2072,6 +2087,7 @@ export default {
             });
             this.checkedSelectLabel = data[0].label;
             this.sadianSelect(data[0].value);
+            this.anbaoSDUWG()//疏导区网格
         },
         /**
          *
@@ -2181,30 +2197,36 @@ export default {
                 // this.anbaoMap()
                 this.grid(id);
                 this.hzzxtb()
+                this.anbaoSDUWG()//疏导区网格
             } else if (id == 16) {
                 this.gridStatus = id;
                 this.grid(16, null, null, 1);
                 // this.anbaoMap()
                 // this.anbao(1, 2);
                 this.hzzxtb()
+                this.anbaoSDUWG()//疏导区网格
             } else if (id == 17) {
                 this.surveillance()
                 this.hzzxtb()
+                this.anbaoSDUWG()//疏导区网格
             } else if (id == 18) {
                 this.gridStatus = id;
                 this.sadianSelect(id);
                 this.hzzxtb()
+                this.anbaoSDUWG()//疏导区网格
             } else if (id == 19) {
                 this.gridStatus = id;
                 this.anbao(1, 3);
                 this.dwgjcmcAndhzzx()
+                this.anbaoSDUWG()//疏导区网格
             } else if (id == 20) {
                 this.gridStatus = id;
                 this.selectVideo(1)
-                
+                this.anbaoSDUWG()//疏导区网格
             } else {
                 this.sadianSelect(id);
                 this.hzzxtb()
+                this.anbaoSDUWG()//疏导区网格
             }
         },
         /* 历史警情 */
@@ -3318,16 +3340,39 @@ export default {
 
         .dailyNewSec{
             height:18%;
-            .dailyItem{
+            .dailyItemLeft{
                 margin-top:.2rem;   
                 line-height:.375rem;
                 font-size:.175rem;
-                .el-col-10::after {
+                width:39%;
+                display: inline-block;
+                vertical-align: middle;
+                height:60%;
+                overflow-y:scroll;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                .el-col::after {
                     content: '|';
-                    margin-left: .25rem;
+                    margin-left: .15rem;
 
                 }
             }
+            .dailyItemRight{
+                vertical-align: middle;
+                margin-left:.15rem;
+                margin-top:.2rem;   
+                line-height:.375rem;
+                font-size:.175rem;
+                width:58%;
+                height:60%;
+                overflow-y:scroll;
+                display: inline-block;
+                a{
+                    color:#fff;
+                    text-decoration: none;
+                }
+            }
         }
         .girdCheckSec{
             height:38%;