新需求解决

src/components/mixins/map-data1.js

@@ -1902,7 +1902,16 @@ export default {
          */
         anbaoPopup(data) {
             var children = []
-
+            if (data.type == 19) {
+                children = [
+                    ["街道：", data.content[0].streetTown, 12],
+                    ["街镇分管领导：", data.content[0].type1, 12],
+                    ["城运中心人员：", data.content[0].type2, 12],
+                    ["安监所所长：", data.content[0].type3, 12],
+                    ["支队外勤参谋：", data.content[0].type4, 12],
+                    
+                ]
+            }
             if (data.type == 15) {
                 children = [
                     ["街道：", data.content.streetTown, 12],
@@ -1919,8 +1928,9 @@ export default {
                     
                 ]
             }
+
             let arrayList = [{
-                title: [data.name, true],
+                title: [data.name == "七宝镇" ? "闵S3（七宝网格）" : data.name == "虹桥镇" ? "闵S4（虹桥网格）" : data.name == "华漕镇" ? "闵S1（华漕网格）" :data.name == "新虹街道" ? "闵S2（新虹网格）" : data.name, true],
                 children: []
             }]
             arrayList[0].children = children
@@ -2385,7 +2395,7 @@ export default {
                         if (pageType == "self-management") {
                             if (val.attrbutes.type == "重点单位") {
                                     // this.elementInfo(val.attrbutes, "重点单位")
-                                that.stores.zddwIdSD(val.attrbutes.companyId);
+                                that.stores.zddwIdSD(val.attrbutes);
                             } else if (val.attrbutes.type == "大型综合体") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
@@ -3339,7 +3349,7 @@ export default {
                     maxDistance: 120000 //最大距离
                 },
                 click: (val) => {
-
+                     
                 },
             });
         },
@@ -3397,7 +3407,15 @@ export default {
                     maxDistance: 120000 //最大距离
                 },
                 click: (val) => {
-
+                    //大型安保 、火灾数据分析
+                    console.log(val)
+                    if (pageType == "security-plan") {
+                        if(type == "大网格街镇名称&国家会展中心"){
+                            if(val._attrbutes.type2 == "大网格"){
+                                that.stores.gridDataChange({name:val._attrbutes.type3,position:{x:val._attrbutes.gisX,y:val._attrbutes.gisY}});
+                            }
+                        }
+                     }
                 },
             });
         },

src/views/security-plan.vue

@@ -446,14 +446,14 @@
                     <div class="girdCheckItem">
                     
                         <el-row class="row_g2">
-                            <el-col :span="8">消防安全重点单位</el-col>
+                            <el-col :span="8">消防安全重点单位<br><span @click="openPdf('http://32.0.15.107:8080/mhvi/zddw.pdf')" style="border-bottom:1px solid #fff">评分标准</span></el-col>
                             <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: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="8">九小场所<br><span @click="openPdf('http://32.0.15.107:8080/mhvi/jxcs.pdf')" style="border-bottom:1px solid #fff">评分标准</span></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>
@@ -929,14 +929,39 @@
                             <span class="color2">单位类型：</span>
                             <span class="color1">重点单位</span>
                         </el-col>
-                        <el-col>
+                        <!-- <el-col v-if="tkData.linkPhone">
                             <span class="color2">联系电话：</span>
                             <span class="color1">{{ tkData.linkPhone }}</span>
-                        </el-col>
-                        <el-col style="border-bottom: 1px solid #fff; padding-bottom: 10px">
+                        </el-col> -->
+                        <el-col>
                             <span class="color2">地址：</span>
                             <span class="color1">{{ tkData.address }}</span>
                         </el-col>
+                        <el-col v-if="tkData.person3">
+                            <span class="color2">单位联系人：</span>
+                            <span class="color1">{{ tkData.person3 }}</span>
+                        </el-col>
+                        <el-col v-if="tkData.phone3" >
+                            <span class="color2">单位联系人电话：</span>
+                            <span class="color1">{{ tkData.phone3 }}</span>
+                        </el-col>
+                        <el-col v-if="tkData.person1">
+                            <span class="color2">消防安全责任人：</span>
+                            <span class="color1">{{ tkData.person1 }}</span>
+                        </el-col>
+                        <el-col v-if="tkData.phone1">
+                            <span class="color2">消防安全责任人电话：</span>
+                            <span class="color1">{{ tkData.phone1 }}</span>
+                        </el-col>
+                        <el-col v-if="tkData.person2">
+                            <span class="color2">消防安全管理人：</span>
+                            <span class="color1">{{ tkData.person2 }}</span>
+                        </el-col>
+                        <el-col v-if="tkData.phone2" style="border-bottom: 1px solid #fff; padding-bottom: 10px">
+                            <span class="color2">消防安全管理人电话：</span>
+                            <span class="color1">{{ tkData.phone2 }}</span>
+                        </el-col>
+                        
                         <el-col style="margin-top: 6px">
                             <span class="color1" style="margin-left: 0">企业消防综合评估</span>
                             <span class="color1" style="float: right"
@@ -1110,18 +1135,18 @@ export default {
                     count3: '355',
                 },
                 {
-                    id: '闵S2（华漕网格）',
+                    id: '闵S2（新虹网格）',
                     count1: '1674',
                     count2: '564',
                     count3: '491',
                 },
                 {
-                    id: '闵S3（华漕网格）',
+                    id: '闵S3（七宝网格）',
                     count1: '1585',
                     count2: '487',
                     count3: '391',
                 },{
-                    id: '闵S4（华漕网格）',
+                    id: '闵S4（虹桥网格）',
                     count1: '1412',
                     count2: '577',
                     count3: '402',
@@ -1496,7 +1521,7 @@ export default {
                 { name: "小网格", value: 103, unit: "个", color: "#7DD807" },
                 // {name:"人员力量",value:41,unit:"人",color:"#058DD1"},
             ], //疏导区基本情况
-            gridStatus: 15,
+            gridStatus: 19,
             dataNo: "加载中...",
             dataNo2: "加载中...",
             stores: this.$useStore(),
@@ -1839,7 +1864,7 @@ export default {
         });
         window.addEventListener("resize", () => this.resizeTimeActions([this.$refs.category, this.$refs.gauge1]), true);
         this.initMap("anbao"); //地图初始化
-        this.anbao(null, 3);//大网格
+        // this.anbao(null, 3);//大网格
         this.dwgjcmcAndhzzx()//大网格名称及会展中心 
         // this.anbaoMap()
         this.getFireSiteDuty(); //各站点执勤实力
@@ -1847,7 +1872,7 @@ export default {
         // this.sadianSelect(this.checkedArray.checkedData[0]);  //撒点
         this.getStaticData(this.value111)   //疏导区社会单位情况统计
         this.getZQStaticData()  //执勤战备力量部署
-        this.anbaoSDUWG2()//疏导区网格
+        this.anbaoSDUWG2()//疏导区网格（大）
         this.basicStaticsData(39)//九小场所统计
         // this.llbutj()//力量部署统计
 
@@ -1892,16 +1917,22 @@ export default {
          * @消防安全重点单位撒点详情
          * @api接口请求
          */
-         async zddwSd(id) {
+         async zddwSd(val) {
             let res = await this.$axios.get(
                 this.$api.selfManagement.scatterData +
                     "?" +
                     this.$qs.stringify({
-                        companyId: id,
+                        companyId: val.companyId,
                     })
             );
             if (res.data) {
                 this.tkData = res.data[0];
+                this.tkData.person1 = val.person1
+                this.tkData.person2 = val.person2
+                this.tkData.person3 = val.person3
+                this.tkData.phone1 = val.phone1
+                this.tkData.phone2 = val.phone2
+                this.tkData.phone3 = val.phone3
                 this.tk = true;
             }
         },
@@ -1953,21 +1984,29 @@ export default {
                         gisX: 121.271655,
                         gisY: 31.227993,
                         type: "wgmc_hc",
+                        type2:"大网格",
+                        type3:"华漕镇",
                     },
                     {
                         gisX: 121.308632,
                         gisY: 31.201660,
                         type: "wgmc_xh",
+                        type2:"大网格",
+                        type3:"新虹街道",
                     },
                     {
                         gisX: 121.333994,
                         gisY: 31.165263,
                         type: "wgmc_qb",
+                        type2:"大网格",
+                        type3:"七宝镇",
                     },
                     {
                         gisX: 121.37880329777738,   
                         gisY: 31.185610251208278,
                         type: "wgmc_hq",
+                        type2:"大网格",
+                        type3:"虹桥镇",
                     },
                     {
                         gisX: 121.302183,
@@ -2016,7 +2055,7 @@ export default {
             })
         },
         staticsPoint(arr,type,val){  //疏导区社会单位情况统计撒点
-                this.anbaoSDUWG()//疏导区网格
+            this.anbaoSDUWG()//疏导区网格
             this.addMarker(arr, "security-plan", val)
         },
         goPoints(type){
@@ -2434,7 +2473,7 @@ export default {
                         }
                     }
                     for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].name.indexOf("单兵") > -1 || arr[i].name.indexOf("无人机") > -1 || arr[i].name.indexOf("布控球") > -1) {
+                        if (arr[i].name.indexOf("单兵") > -1 || arr[i].name.indexOf("无人机") > -1 || arr[i].name.indexOf("布控球") > -1 || arr[i].name.indexOf("救援站") > -1) {
                             
                         }else{
                             zfjly.push(arr[i]);
@@ -2947,7 +2986,21 @@ export default {
                 type: "国家会展中心",
                 }];
                 // this.sadian(hzzx, "security-plan", "国家会展中心");
-            if (id == 15) {
+            if (id == 19) { //大网格
+                this.rightArray.headerData2 = [
+                    { prop: "gridArea", name: "网格区域" },
+                    { prop: "streetTown", name: "街道" },
+                    { prop: "type1", name: "分管镇（街道）领导" },
+                    { prop: "type2", name: "城运中心人员" },
+                    { prop: "type3", name: "安监所所长" },
+                    { prop: "type4", name: "支队外勤参谋" },
+                ];
+                querySearch = {
+                    gridArea: area,
+                    gridGrade: 1,
+                };
+            }
+            if (id == 15) {//中网格
                 this.rightArray.headerData2 = [
                     { prop: "gridArea", name: "网格区域" },
                     { prop: "streetTown", name: "街道" },
@@ -2960,7 +3013,7 @@ export default {
                     gridGrade: 2,
                 };
             }
-            if (id == 16) {
+            if (id == 16) {//小网格
                 this.rightArray.headerData2 = [
                     { prop: "gridArea", name: "网格区域" },
                     { prop: "streetTown", name: "街道" },
@@ -2989,9 +3042,40 @@ export default {
                                 type1: undefined,
                                 type2: undefined,
                                 type3: undefined,
+                                type4: undefined,
                             };
                             if (data[i].gridMemderViceList) {
                                 for (let ii = 0; ii < data[i].gridMemderViceList.length; ii++) {
+                                    if (id == 19) {
+                                        if (data[i].gridMemderViceList[ii].personnelType == 3) {
+                                            if (gridData[i].type1) {
+                                                gridData[i].type1 = `${gridData[i].type1}</br>${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            } else {
+                                                gridData[i].type1 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            }
+                                        }
+                                        if (data[i].gridMemderViceList[ii].personnelType == 4) {
+                                            if (gridData[i].type2) {
+                                                gridData[i].type2 = `${gridData[i].type2}</br>${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            } else {
+                                                gridData[i].type2 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            }
+                                        }
+                                        if (data[i].gridMemderViceList[ii].personnelType == 5) {
+                                            if (gridData[i].type3) {
+                                                gridData[i].type3 = `${gridData[i].type3}</br>                           ${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            } else {
+                                                gridData[i].type3 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            }
+                                        }
+                                        if (data[i].gridMemderViceList[ii].personnelType == 6) {
+                                            if (gridData[i].type4) {
+                                                gridData[i].type4 = `${gridData[i].type4}</br>                               ${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            } else {
+                                                gridData[i].type4 = `${data[i].gridMemderViceList[ii].personnelName} ${data[i].gridMemderViceList[ii].phone}`;
+                                            }
+                                        }
+                                    }
                                     if (id == 15) {
                                         if (data[i].gridMemderViceList[ii].personnelType == 7) {
                                             if (gridData[i].type1) {
@@ -3035,6 +3119,15 @@ export default {
                             }
                         }
                     }
+                    console.log(gridData)
+                    // if(id == 19){
+                    //     let arr = {};
+                    //     arr.type = id;
+                    //     arr.name = area;
+                    //     // arr.position = position;
+                    //     arr.content = gridData;
+                    //     this.anbaoPopup(arr); 
+                    // }
                     if (position) {
                         let arr = {};
                         arr.type = id;
@@ -3042,7 +3135,10 @@ export default {
                         arr.position = position;
                         arr.content = gridData;
                         this.anbaoPopup(arr);
-                        this.superiorGrid(gridData[0].seniorGrid, id == 15 ? 1 : id == 16 ? 2 : "");
+                        if(id !=19){
+                            this.superiorGrid(gridData[0].seniorGrid, id == 15 ? 1 : id == 16 ? 2 : "");
+                        }
+                        
                     } else {
                     }
                     this.rightArray.tableData = gridData;
@@ -3088,7 +3184,7 @@ export default {
                             //镇级
                             this.diversionArea[0] = {
                                 name: `${data.gridArea}面积`,
-                                value: data.gridArea == "华漕镇" ? 61.46 : data.gridArea == "新虹街道" ? "19.26" : data.gridArea == "七宝镇" ? "7" : data.gridArea == "虹桥镇" ? "17" : "",
+                                value: data.gridArea == "华漕镇" ? 28.2 : data.gridArea == "新虹街道" ? "19.26" : data.gridArea == "七宝镇" ? "7" : data.gridArea == "虹桥镇" ? "7" : "",
                                 unit: "km²",
                                 color: "#7DD807",
                             };
@@ -3245,6 +3341,10 @@ export default {
 
     watch: {
         "stores.$state.gridData": function (newValue, oldValue) {
+            console.log(this.gridStatus)
+            if (this.gridStatus == 19) {
+                this.grid(19, newValue.name, newValue.position);
+            }
             if (this.gridStatus == 15) {
                 this.grid(15, newValue.name, newValue.position);
                 this.staticsSd(newValue.name,2,'')