安保撒点弹框test加入

src/components/mixins/map-data1.js

@@ -365,8 +365,6 @@ export default {
                                 name2.push(item.attributes.name)
                             })
                         })
-
-                        console.log(222,big2Arr)
                          //画线---------------------------------
                             let huaxian = []
                             for(let i=0;i<big2Arr.length;i++){
@@ -725,7 +723,6 @@ export default {
          * @param {页面类型} type
          */
         addMarker(lnglats, pageType, type) {
-            console.log(lnglats, pageType, type)
             window.jMap.Locate.clearLocate();
             let that = this
             let icon = "";
@@ -1131,7 +1128,6 @@ export default {
                         }
                         //大型安保 、火灾数据分析
                         if (pageType == "security-plan") {
-                            console.log(111,pageType,type)
                             if (type == "监控视频") {
                                 let arrayList = [{
                                     title: ["监控视频", true],
@@ -1144,9 +1140,7 @@ export default {
                                 }, ];
                                 that.stores.jkspChange(arrayList);
                             }
-                            console.log(type)
                             if (type == "监督检查") {
-                                console.log(val.attrbutes)
                                 let arrayList = [{
                                     title: ["监督检查", true],
                                     children: [
@@ -1169,13 +1163,13 @@ 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.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
                                         ["隐患问题：", msgParse.test1, 24],
@@ -1260,6 +1254,118 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            if (type == "宾馆酒店" || 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],
+                                        ["房间数：",msgParse.test1, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "大型商业综合体") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["管理人：",msgParse.test1, 24],
+                                        ["电话：",msgParse.test1, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "厂房仓库" || 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],
+                                        ["所属单位：",msgParse.test1, 24],
+                                        ["公司名称：",msgParse.test2, 24],
+                                        ["公司负责人及联系方式：",`${msgParse.test3} ${msgParse.test4}`, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "批发市场") {
+                                // let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                        
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "规模租赁公寓") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                        ["建筑面积 ( 平方米 )：",msgParse.test1, 24],
+                                        ["房间数量(间)：",msgParse.test2, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "三合一场所") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                        ["住宿人员数量：",msgParse.test1, 24],
+                                        ["是否整改：",msgParse.test2, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            //疏导区单位情况----------------------
+
+                            //疏导区基本情况----------------------
+                            if (type == "学校") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [type, true],
+                                    children: [
+                                        ["单位名称：", val.attrbutes.facilityName, 24],
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                        ["场所名称：",msgParse.test1, 24],
+                                        ["法定代表人：",msgParse.test2, 24],
+                                        ["主标签：",msgParse.test3, 24],
+                                        ["次标签：",msgParse.test4, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+
+                            
                         }
                         //火灾数据分析
                         if (pageType == "fire-data-analysis") {
@@ -1522,7 +1628,6 @@ export default {
          * @param {页面类型} type
          */
          addMarkerWG(lnglats, pageType, type) {
-            console.log(1111,lnglats, pageType, type)
             let that = this
             let icon = "";
             var target = lnglats.map((val, ind) => {
@@ -1531,7 +1636,6 @@ export default {
                 var y = wgs84[1]
                 if (
                     pageType == "security-plan") {
-                        console.log(val.type)
                     let marker = {
                         id: ind + 1,
                         attrbutes: val,
@@ -1553,10 +1657,10 @@ export default {
                             val.type == "wgmc_hq" ? 98 : 
                             val.type == "国家会展中心" ? 83 : 19.5,
                             
-                            height: val.type == "wgmc_hc" ? 35 :  
-                            val.type == "wgmc_xh" ? 35 :  
-                            val.type == "wgmc_qb" ? 35 :  
-                            val.type == "wgmc_hq" ? 35 :  
+                            height: val.type == "wgmc_hc" ? 38 :  
+                            val.type == "wgmc_xh" ? 38 :  
+                            val.type == "wgmc_qb" ? 38 :  
+                            val.type == "wgmc_hq" ? 38 :  
                             val.type == "国家会展中心" ? 59 : 25,
                         },
                     };

src/components/unitBox/index.vue

@@ -105,7 +105,8 @@ export default {
     props: {
         typeValue: { type: Number, default: () => 1 },
         arrayData:{ type: Array, default: () => [] },
-        staticData:{type: Object, default: () => {} }
+        staticData:{type: Object, default: () => {} },
+        type:{type:Number}
 
     },
     mixins: [linstener],
@@ -216,6 +217,56 @@ export default {
                 { prop: "address", name: "地址" },
                 { prop: "dangerIssue", name: "隐患问题" },
             ], //各街镇物联动态-table表格prop头部定义
+            options: [
+            {
+                value: '23',
+                label: '宾馆酒店',
+            },
+            {
+                value: '25', //
+                label: '大型商业综合体',
+            },   
+            // {
+            //     value: '13', //?
+            //     label: '消防安全重点单位',
+            // },
+            {
+                value: '30',
+                label: '医疗机构',
+            },
+            {
+                value: '29',
+                label: '养老机构',
+            },
+            
+            {
+                value: '24',
+                label: '厂房仓库',
+            },
+            {
+                value: '27',
+                label: '批发市场',
+            },
+            {
+                value: '5',
+                label: '居民小区',  //??
+            },
+        
+            {
+                value: '26',
+                label: '规模租赁公寓',
+            },
+            {
+                value: '28',
+                label: '三合一场所',
+            },
+        
+            {
+                value: '6',//???? 
+                label: '电动自行车领域',
+            },
+       
+        ],
         };
     },
     watch: {
@@ -242,11 +293,22 @@ export default {
                                 "facilityType": [this.typeValue] ,
                                 "streetTown": val 
                         }).then((res) => {
-                            console.log(res)
                                 let arr = []
                                 if(res.data.length>0){
                                     arr = res.data;
-                                    that.$emit("staticsPoint",arr,this.typeValue,val)
+                                    let data = {
+                                        gisX: 121.302183,
+                                        gisY: 31.189991,
+                                        type: "国家会展中心",
+                                    };
+                                    arr.push(data)
+                                    let typeName = undefined
+                                    for(let i=0;i<this.options.length;i++){
+                                        if(this.options[i].value == this.type){
+                                            typeName = this.options[i].label
+                                        }
+                                    }
+                                    that.$emit("staticsPoint",arr,this.typeValue,typeName)
                                 }  
                         });
 

src/views/head.vue

@@ -11,13 +11,14 @@
       >
     </el-row> -->
         <el-row class="title" v-if="title">闵行区消防管理与应急救援数字平台</el-row>
-        <el-row class="title2" v-if="!title">进博会消防安保平台</el-row>
+        <el-row class="title4" v-if="!title">第六届中国国际进口博览会消防安保指挥平台</el-row>
+        <!-- <el-row class="title2" v-if="!title">进博会消防安保平台</el-row>
         <el-row class="title3" v-if="!title">
             <span >火灾防控</span>
             <span style="margin-left:.2rem;margin-top:.05rem;font-size:.2rem" >
                 <a href="http://32.1.7.96:8010/zhts_mh_20231011_v1/#/ciieSecurity" style="text-decoration:none;color:rgba(137, 128, 128, 0.1);" target="_blank">指挥调度</a>
             </span>
-        </el-row>
+        </el-row> -->
         <div class="nowTime">
             <div class="day">{{ dateDay }}</div>
             <div class="time">{{ dataTime }}</div>
@@ -288,6 +289,26 @@ watch(
         }
         // 转变为行内块元素 文字
     }
+    .title4 {
+        position: absolute;
+        left: 0;
+        right: 0;
+        margin: auto;
+        top: 0.03rem;
+        font-size: 0.35rem;
+        letter-spacing: 4px;
+        font-weight: 700;
+        width: fit-content;
+        @include color_primary($color-primary1);
+        background: linear-gradient(to bottom, #b4dffc, #fbfeff);
+        -webkit-background-clip: text;
+        color: transparent;
+        font-family: syhtB !important;
+        >p{
+            font-size: 0.25rem;
+        }
+        // 转变为行内块元素 文字
+    }
     .title3 {
         position: absolute;
         left: 0;

src/views/security-plan.vue

@@ -121,7 +121,7 @@
                             </el-form>
                         </div>
                     </div>
-                    <unit-box :typeValue="value111" :arrayData="arrayData" :staticData="staticData" v-if="staticData.total"  @staticsPoint="staticsPoint"></unit-box>
+                    <unit-box :typeValue="value111" :arrayData="arrayData" :staticData="staticData" v-if="staticData.total" :type="value111" @staticsPoint="staticsPoint"></unit-box>
                     <div v-else>暂无数据</div>
 
                     <!-- <category
@@ -1014,10 +1014,10 @@ export default {
             value: '27',
             label: '批发市场',
         },
-        {
-            value: '5',
-            label: '居民小区',  //??
-        },
+        // {
+        //     value: '5',
+        //     label: '居民小区',  //??
+        // },
        
         {
             value: '26',
@@ -1037,88 +1037,106 @@ export default {
         arrayData:[],
         line3Array:[
                 {
-                    "name": "大型综合体",
-                    "count": 21,
-                    "value":25
+                    "name": "消防安全重点单位",
+                    "count": 176,
+                    "value":0
                 },
                 {
-                    "name": "重点单位",
-                    "count": 14,
-                    "value":13
+                    "name": "大型商业综合体",
+                    "count": 13,
+                    "value":25
                 },
+                // {
+                //     "name": "重点单位",
+                //     "count": 14,
+                //     "value":13
+                // },
                 {
                     "name": "酒店/宾馆",
-                    "count": 110,
+                    "count": 85,
                     "value":23
                 },
                 {
-                    "name": "高层建筑",   
-                    "count": 839,
-                    "value":0  //?
-                },{
-                    "name": "厂房/仓库",
-                    "count": 131,
-                    "value":24  
-                },
-                {
-                    "name": "商市场",
-                    "count": 11,
-                    "value":0  //?
+                    "name": "规模租赁公寓",
+                    "count": 90,
+                    "value":26  
                 },
+                // {
+                //     "name": "高层建筑",   
+                //     "count": 839,
+                //     "value":0  //?
+                // },
                 {
-                    "name": "公共娱乐场所",
-                    "count": 38,
-                    "value":0  //?
+                    "name": "厂房/仓库",
+                    "count": 83,
+                    "value":24  
                 },
+                // {
+                //     "name": "商市场",
+                //     "count": 11,
+                //     "value":0  //?
+                // },
+                // {
+                //     "name": "公共娱乐场所",
+                //     "count": 38,
+                //     "value":0  //?
+                // },
                 {
                     "name": "医疗机构",
-                    "count": 12,
+                    "count": 18,
                     "value":30,
                 },{
                     "name": "养老机构",
-                    "count": 5,
+                    "count": 10,
                     "value":29,
                 },
-                
-                {
-                    "name": "规模租赁",
-                    "count": 67,
-                    "value":26  
-                },
                 {
-                    "name": "办公楼宇",
-                    "count": 52,
-                    "value":0  //?
+                    "name": '批发市场',
+                    "count": 2,
+                    "value": '27',
                 },
                 {
-                    "name": "在建工地",
-                    "count": 6,
-                    "value":0  //?
+                    "name": '学校',
+                    "count": 23,
+                    "value": '37',
                 },
                 {
-                    "name": "居民小区",
-                    "count": 199,
-                    "value":0  //?
-                },{
                     "name": "沿街门面",
                     "count": 3080,
                     "value":0  //?
                 },
+                // {
+                //     "name": "办公楼宇",
+                //     "count": 52,
+                //     "value":0  //?
+                // },
+                // {
+                //     "name": "在建工地",
+                //     "count": 6,
+                //     "value":0  //?
+                // },
                 {
-                    "name": "宗教场所",
-                    "count": 4,
+                    "name": "居民小区",
+                    "count": 188,
                     "value":0  //?
                 },
+                
+                // {
+                //     "name": "宗教场所",
+                //     "count": 4,
+                //     "value":0  //?
+                // },
+                // {
+                //     "name": "学校",
+                //     "count": 23,
+                //     "value":37  
+                // },
+                // {
+                //     "name": "加油（汽）站",
+                //     "count": 10,
+                //     "value":0  //?
+                // },
                 {
-                    "name": "学校",
-                    "count": 23,
-                    "value":37  
-                },
-                {
-                    "name": "加油（汽）站",
-                    "count": 10,
-                    "value":0  //?
-                },{
                     "name": "地铁站",
                     "count": 4,
                     "value":0  //?
@@ -1559,8 +1577,8 @@ export default {
                         type: "wgmc_xh",
                     },
                     {
-                        gisX: 121.326266,
-                        gisY: 31.165491,
+                        gisX: 121.333994,
+                        gisY: 31.165263,
                         type: "wgmc_qb",
                     },
                     {
@@ -1598,7 +1616,6 @@ export default {
                     "facilityType": [33,34,35,36] ,
                     "statisticType":"facilityType",
             }).then((res) => {
-                console.log(2222,res)
                 for(let i =0;i<res.data.length;i++){
                     if(res.data[i].facilityType == "33"){
                         this.staticData.array1[0].count = res.data[i].count
@@ -1616,18 +1633,13 @@ export default {
             })
         },
         staticsPoint(arr,type,val){  //疏导区社会单位情况统计撒点
-            // alert(type)
-            // alert(val)
             this.addMarker(arr, "security-plan", val)
-            console.log(arr)
-
         },
         goPoints(type){
             // alert(type)
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [type ] 
                         }).then((res) => {
-                            console.log(123,res)
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
@@ -1652,12 +1664,17 @@ export default {
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [type ] 
                         }).then((res) => {
-                            console.log(res)
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
                                         this.arrayData= res.data;
-                                        this.addMarker(arr, "security-plan", name+' ')
+                                        let data = {
+                                            gisX: 121.302183,
+                                            gisY: 31.189991,
+                                            type: "国家会展中心",
+                                        };
+                                        arr.push(data)
+                                        this.addMarker(arr, "security-plan", name)
                                         // if(type=='29'){
                                         //     this.addMarker(arr, "security-plan", "养老机构")
                                         // }else if(type=='30'){
@@ -1679,7 +1696,6 @@ export default {
                                 "facilityType": [33,34,35,36 ],
                                 "statisticType":"facilityType",
                         }).then((res) => {
-                            console.log(res)
                     // this.staticData.array=res.data;
                     // var colorArr=['#00C8B8','#068DFF','#FF843A','#7DD807'];
                     // this.staticData.array.forEach((item, index) => {
@@ -1726,7 +1742,6 @@ export default {
                 this.$axios.post(this.$api.water.baseGgpFacilityList,{
                                 "facilityType": [val ] 
                         }).then((res) => {
-                            console.log(res)
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
@@ -1849,7 +1864,6 @@ export default {
                         // "ENDTIME":"2023-12-01",
                     }
                 }).then((res2) => {
-                    console.table(res2.values)
                     this.gridStatisticsTable.total = []
                     this.gridStatisticsTable.over = []
                     this.gridStatisticsTable.yinhuan = []
@@ -2555,7 +2569,6 @@ export default {
                         }
                         
                     }
-                    console.log(queryData)
                     this.anbao(1, 2, queryData);
                 }
             });
@@ -2885,7 +2898,7 @@ export default {
                    
                     .basicItem{
                         cursor:pointer;
-                        width:14.28%; margin: 0px 0;  box-sizing: border-box;
+                        width:25% !important; margin: 0px 0;  box-sizing: border-box;
                         position:relative;
                     }
                     // .basicItem::after {