进博会 - 疏导区基本情况调整

src/assets/js/flexible.js

@@ -15,7 +15,6 @@
     // set 1rem = viewWidth / 10
     function setRemUnit() {
         var rem = docEl.clientWidth / 24;
-        console.log(rem)
         docEl.style.fontSize = rem + "px";
     }
 

src/components/mixins/map-data.js

@@ -214,7 +214,6 @@ export default {
          * @param {*} type 
          */
         addMarker(lnglats, type) {
-            console.log(lnglats)
             let icon = ''
             if (type == "selfManagement") {
                 var lnglats = lnglats

src/components/mixins/map-data1.js

@@ -2608,7 +2608,7 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "大型商业综合体") {
+                            if (type == "大型综合体") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
                                     title: [type, true],
@@ -2652,7 +2652,7 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "规模租赁公寓") {
+                            if (type == "规模租赁") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
                                     title: [type, true],
@@ -2998,7 +2998,7 @@ export default {
                                 this.popup(val._attrbutes, arrayList, true)
                             }
                             //疏导区基本情况----------------------
-                            if (type == "消防安全重点单位") {
+                            if (type == "重点单位") {
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
                                     title: [type, true],
@@ -3018,7 +3018,7 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
-                            if (type == "儿童福利机构") {
+                            if (type == "儿童福利") {
                                 let arrayList = [{
                                     title: [type, true],
                                     children: [

src/views/security-plan.vue

@@ -1494,12 +1494,12 @@ export default {
         arrayData:[],
         line3Array:[
                 {
-                    "name": "消防安全重点单位",
+                    "name": "重点单位",
                     "count": 176,
                     "value":40
                 },
                 {
-                    "name": "大型商业综合体",
+                    "name": "大型综合体",
                     "count": 13,
                     "value":25
                 },
@@ -1514,7 +1514,7 @@ export default {
                     "value":23
                 },
                 {
-                    "name": "规模租赁公寓",
+                    "name": "规模租赁",
                     "count": 90,
                     "value":26  
                 },
@@ -1553,7 +1553,7 @@ export default {
                     "value": '27',
                 },
                 {
-                    "name": '儿童福利机构',
+                    "name": '儿童福利',
                     "count": 1,
                     "value": '41',
                 },
@@ -2262,72 +2262,72 @@ export default {
 
         basicStaticsData(type,name){  //疏导区基本情况 统计点击事件
             this.$axios.post(this.$api.water.baseGgpFacilityList,{
-                    "facilityType": type == "新消监" ? [39,42] : type == 399 ? [39] : [type]
+                "facilityType": type == "新消监" ? [39,42] : type == 399 ? [39] : [type]
             }).then((res) => {
                     let arr = []
-                    if(res.data.length>0){
-                            arr = res.data;
-                            let data = {
-                                gisX: 121.302183,
-                                gisY: 31.189991,
-                                type: "国家会展中心",
-                            };
-                            // arr.push(data)
-                            if(type == "29" || type == "30"){
-                                this.arrayData= res.data;
-                            }
-                            //新消监
-                            if(type == "新消监"){
-                                this.addMarker(arr, "security-plan", type)
+                if(res.data.length>0){
+                    arr = res.data;
+                    let data = {
+                        gisX: 121.302183,
+                        gisY: 31.189991,
+                        type: "国家会展中心",
+                    };
+                    // arr.push(data)
+                    if(type == "29" || type == "30"){
+                        this.arrayData= res.data;
+                    }
+                    //新消监
+                    if(type == "新消监"){
+                        this.addMarker(arr, "security-plan", type)
+                    }else{
+                        let dataOther = [data]
+                        if(type == 39){ //九小场所
+                            
+                            this.anbaoSDUWG()//疏导区网格
+                            if(name){
+                                for(let i=0;i<arr.length;i++){
+                                    if(arr[i].checkComment){
+                                        if(name == arr[i].checkComment){
+                                            dataOther.push(arr[i])
+                                        }
+                                    }
+                                }
+                                this.addMarker(dataOther, "security-plan", name)
                             }else{
-                                let dataOther = [data]
-                                if(type == 39){ //九小场所
-                                    
-                                    this.anbaoSDUWG()//疏导区网格
-                                    if(name){
-                                        for(let i=0;i<arr.length;i++){
-                                            if(arr[i].checkComment){
-                                                if(name == arr[i].checkComment){
-                                                    dataOther.push(arr[i])
-                                                }
-                                            }
+                                this.jxcstj = [0,0,0,0]
+                                for(let i=0;i<arr.length;i++){
+                                    if(arr[i].checkComment){
+                                        if(arr[i].checkComment == "高风险"){
+                                                this.jxcstj[0] ++
                                         }
-                                        this.addMarker(dataOther, "security-plan", name)
-                                    }else{
-                                        this.jxcstj = [0,0,0,0]
-                                        for(let i=0;i<arr.length;i++){
-                                            if(arr[i].checkComment){
-                                                if(arr[i].checkComment == "高风险"){
-                                                        this.jxcstj[0] ++
-                                                }
-                                                if(arr[i].checkComment == "较高风险"){
-                                                        this.jxcstj[1] ++
-                                                }
-                                                if(arr[i].checkComment == "一般风险"){
-                                                        this.jxcstj[2] ++
-                                                }
-                                                if(arr[i].checkComment == "低风险"){
-                                                        this.jxcstj[3] ++
-                                                }
-                                            }
+                                        if(arr[i].checkComment == "较高风险"){
+                                                this.jxcstj[1] ++
+                                        }
+                                        if(arr[i].checkComment == "一般风险"){
+                                                this.jxcstj[2] ++
+                                        }
+                                        if(arr[i].checkComment == "低风险"){
+                                                this.jxcstj[3] ++
                                         }
                                     }
-                                }else{
-                                    this.addMarker(arr, "security-plan", name)
                                 }
                             }
-                            if(type == 399){ //沿街门面 左侧顶部
-                                this.addMarker(dataOther, "security-plan", name)
+                        }else{
+                            this.addMarker(arr, "security-plan", name)
+                        }
+                    }
+                    if(type == 399){ //沿街门面 左侧顶部
+                        this.addMarker(dataOther, "security-plan", name)
 
-                            }
-                            
-                            this.anbaoSDUWG()//疏导区网格
-                            // if(type=='29'){
-                            //     this.addMarker(arr, "security-plan", "养老机构")
-                            // }else if(type=='30'){
-                            //     this.addMarker(arr, "security-plan", "医疗机构")
-                            // }
-                    }  
+                    }
+                    
+                    this.anbaoSDUWG()//疏导区网格
+                    // if(type=='29'){
+                    //     this.addMarker(arr, "security-plan", "养老机构")
+                    // }else if(type=='30'){
+                    //     this.addMarker(arr, "security-plan", "医疗机构")
+                    // }
+                }  
             });
         },
         basicGoBack(){  //疏导区基本情况 返回