修复

src/components/mixins/map-data1.js

@@ -1131,30 +1131,7 @@ export default {
                         }
                         //大型安保 、火灾数据分析
                         if (pageType == "security-plan") {
-                            console.log(pageType,type)
-                            // let arrayList = [{
-                            //     title: ["案件详情", true],
-                            //     children: [
-                            //         ["案件编号：", val.attrbutes.ajbh, 24],
-                            //         ["案件描述：", val.attrbutes.bcxx, 24],
-                            //         ["报警时间：", val.attrbutes.tzsj, 24],
-                            //         ["案件类型：", val.attrbutes.ajlx, 24],
-                            //         ["警情类别：", type, 24],
-                            //         ["警情等级：", val.attrbutes.ajdj, 24],
-                            //         ["调动车辆：", val.attrbutes.cdcl, 24],
-                            //         ["处置对象：", val.attrbutes.czdx, 24],
-                            //         ["主责中队：", val.attrbutes.zhongdui, 24],
-                            //         ["案件状态：", val.attrbutes.ajzt, 24],
-                            //         ["到场时间：", val.attrbutes.cssj, 24],
-                            //         ["控制时间：", val.attrbutes.kzsj, 24],
-                            //         ["熄灭时间：", val.attrbutes.xmsj, 24],
-                            //         ["返队时间：", val.attrbutes.fdsj, 24],
-                            //         ["所属街道：", val.attrbutes.streettown, 24],
-                            //     ],
-                            // }, ];
-                            // if (val._attrbutes.type != "国家会展中心") {
-                            //     this.popup(val._attrbutes, arrayList, true)
-                            // }
+                            console.log(111,pageType,type)
                             if (type == "监控视频") {
                                 let arrayList = [{
                                     title: ["监控视频", true],
@@ -1166,10 +1143,6 @@ export default {
                                     id: val.attrbutes.id
                                 }, ];
                                 that.stores.jkspChange(arrayList);
-                                // this.popup(val._attrbutes, arrayList, true)
-                                // if (val._attrbutes.type != "国家会展中心") {
-                                //     this.popup(val._attrbutes, arrayList, true)
-                                // }
                             }
                             console.log(type)
                             if (type == "监督检查") {
@@ -1197,6 +1170,7 @@ export default {
                                 this.popup(val._attrbutes, arrayList, true)
                             }
                             if (type == "养老机构") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
                                     title: [type, true],
                                     children: [
@@ -1204,25 +1178,27 @@ export default {
                                         // ["设施类型：", val.attrbutes.facilityType, 24],
                                         ["地址：", val.attrbutes.address, 24],
                                         ["所属街镇：", val.attrbutes.streetTown, 24],
+                                        ["隐患问题：", msgParse.test1, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
                             if (type == "医疗机构") {
-                                console.log(val.attrbutes)
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                console.log(msgParse)
                                 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],
+                                        ["隐患问题：", msgParse.test2, 24],
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
                             if (type == "流动消防站（一级）") {
-                                console.log(222222222)
                                 let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{
                                     title: [val.attrbutes.facilityName, true],

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">
-                        {{scope.row.test1}}
+                        {{scope.row}}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
           
         </el-table>
     </div>

src/views/security-plan.vue

@@ -1730,13 +1730,17 @@ export default {
                                 let arr = []
                                 if(res.data.length>0){
                                         arr = res.data;
-                                        
-                                        this.arrayData= res.data;
-                                    //    console.log(JSON.parse(this.arrayData[1].extendData) )
                                         this.arrayData.forEach((item) => {
                                             item.test1=item.extendData?JSON.parse(item.extendData).test1:'111'
-                                      
                                         })
+                                        
+                                        // console.log()
+                                        let data = {
+                                            gisX: 121.302183,
+                                            gisY: 31.189991,
+                                            type: "国家会展中心",
+                                        };
+                                        arr.push(data)
                                         if(val=='29'){
                                             this.addMarker(arr, "security-plan", "养老机构")
                                         }else{