疏导区社会单位情况撒点+表格数据对接

src/components/mixins/map-data1.js

@@ -659,7 +659,8 @@ export default {
                                 type == "高风险" ? this.stores.sadianIcon.gfx : type == "较高风险" ? this.stores.sadianIcon.jgfx : type == "一般风险" ? this.stores.sadianIcon.ybfx : type == "低风险" ? this.stores.sadianIcon.dfx :
 
                                 type == "单位巡检" ? this.stores.sadianIcon.dwxj : type == "物联网设备" ? this.stores.sadianIcon.dwxj : type == "监控视频" ? this.stores.sadianIcon.ssjq : type == "监督检查" ? this.stores.sadianIcon.jdjc :
-
+                                type == "养老机构安全隐患清单" ?  this.stores.sadianIcon.xfdjl :
+                                type == "医疗机构安全隐患清单" ?  this.stores.sadianIcon.zzd :
 
                                 this.stores.sadianIcon.trsy,
 
@@ -1048,6 +1049,32 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            if (type == "养老机构安全隐患清单") {
+                                console.log(val.attrbutes)
+                                let arrayList = [{
+                                    title: ["养老机构安全隐患清单", true],
+                                    children: [
+                                        ["设施名称：", val.attrbutes.facilityName, 24],
+                                        ["设施类型：", val.attrbutes.facilityType, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["所属街镇：", val.attrbutes.streetTown, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+                            if (type == "医疗机构安全隐患清单") {
+                                console.log(val.attrbutes)
+                                let arrayList = [{
+                                    title: ["医疗机构安全隐患清单", true],
+                                    children: [
+                                        ["设施名称：", val.attrbutes.facilityName, 24],
+                                        ["设施类型：", val.attrbutes.facilityType, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["所属街镇：", val.attrbutes.streetTown, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
                         }
                         //火灾数据分析
                         if (pageType == "fire-data-analysis") {

src/components/unitBox/index.vue

@@ -32,11 +32,11 @@
         </el-row>
     </div> 
 
-     <!-- 宾馆酒店信息统计   大型商业  各街镇 规模租赁 三合一   图表+统计 -->
-     <div  v-if="typeValue==2||typeValue==3||typeValue==4||typeValue==5||typeValue==6||typeValue==10">
+     <!-- 宾馆酒店信息统计   大型商业  各街镇  规模租赁 三合一   图表+统计 -->
+     <div  v-if="typeValue==23||typeValue==26||typeValue==28">
         <el-row >
             <el-col :span="10">
-            <bar></bar>
+            <bar :total="staticData.total"></bar>
         
         </el-col>
             <el-col :span="14">
@@ -94,48 +94,15 @@
 
 
     <!-- 养老  医疗机构清单 表格 -->
-    <div class="rightBotContent" v-if="typeValue==7||typeValue==8||typeValue==9" style="margin-top:15px;height: 100%;">
-        <el-table  ref="reportTable" height="100%" :data="streetDynamicData"  class="transparentTableRow" style="width: 100%"
+    <!-- <div>{{ arrayData }}</div> -->
+    <div class="rightBotContent" v-if="typeValue==29||typeValue==30" style="margin-top:15px;height: 100%;">
+        <el-table  ref="reportTable" height="100%" :data="arrayData"  class="transparentTableRow" style="width: 100%"
             @mouseenter="autoScroll(true)" @mouseleave="autoScroll()">
-            <el-table-column v-for="item in streetDynamicHeaderData" :key="item.prop" :prop="item.prop" align="center"
-                :label="item.name">
-                <template #default="scope">
-                    <el-tooltip placement="left" trigger="click">
-                        <template #content>
-                            <div class="tableTooltip">
-                                <div class="tableTitle" ref="ff">
-                                    <div>物联动态详情</div>
-                                </div>
-                                <img src="~@a/img/icon/close.png" alt="" class="close" @click="closeIsTooltip" />
-                                <el-row class="tableContent">
-                                    <el-col :span="24">
-                                        街镇：
-                                        <span>{{ scope.row.streetTown ? scope.row.streetTown : "--" }}</span>
-                                    </el-col>
-                                    <el-col :span="24">
-                                        设备总数：<span>{{ scope.row.medicalName ? scope.row.medicalName : "--" }}</span>
-                                    </el-col>
-                                    <el-col :span="24">
-                                        在线数：<span> {{ scope.row.address ? scope.row.address : "--" }}</span>
-                                    </el-col>
-                                    <el-col :span="24">
-                                        在线率：<span>{{ scope.row.dangerIssue ? scope.row.dangerIssue : "--" }}</span>
-                                    </el-col>
-                                    <el-col :span="24">
-                                        处置率：<span>{{ scope.row.processedRate ? scope.row.processedRate : "--" }}</span>
-                                    </el-col>
-                                </el-row>
-                            </div>
-                        </template>
-
-                        <template>
-                            <div class="name-wrapper">
-                                {{ scope.row[item.prop] }}
-                            </div>
-                        </template>
-                    </el-tooltip>
-                </template>
-            </el-table-column>
+            <el-table-column align="left" label="设施名称" prop="facilityName"></el-table-column>
+            <el-table-column align="left" label="设施类型"  prop="facilityType"></el-table-column>
+            <el-table-column align="left" label="地址" prop="address"></el-table-column>
+            <el-table-column align="left" label="所属街镇" prop="streetTown"></el-table-column>
+          
         </el-table>
     </div>
 
@@ -153,7 +120,9 @@ import bar from "@c/bar/index2";
 export default {
     components: { bar },
     props: {
-        typeValue: { type: Number, default: () => 3 },
+        typeValue: { type: Number, default: () => 1 },
+        arrayData:{ type: Array, default: () => [] },
+        staticData:{type: Object, default: () => {} }
 
     },
     mixins: [linstener],

src/http/api.js

@@ -58,6 +58,7 @@ let api = {
         fireWaterOne: "/api/fireWater/one",
         fireWaterStatistics: "/api/fireWater/fireWaterStatistics",
         baseGgpFacilityList: "/prod-api/service-fire/baseGgpFacility/baseGgpFacilityList", //消防水源撒点
+        baseGgpFacilityStatistic: "/prod-api/service-fire/baseGgpFacility/statistic", //统计
     },
     house: {
         //警情综合处置

src/views/security-plan.vue

@@ -106,20 +106,20 @@
                                     </el-select> -->
                                     
 
-                                    <el-select v-model="value" class="m-2" placeholder="请选择"  style="width:200px">
+                                    <el-select   v-model="value111" @change="getOneUnit" class="m-2" placeholder="请选择"  style="width:200px">
                                         <el-option
-                                        v-for="item in options"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value"
-                                        />
+                                            v-for="item in options"
+                                            :key="item.value"
+                                            :label="item.label"
+                                            :value="item.value"
+                                            />
                                     </el-select>
                                 </el-form-item>
                             </el-form>
                         </div>
                     </div>
                     
-                    <unit-box :typeValue="value"></unit-box>
+                    <unit-box :typeValue="value111" :arrayData="arrayData" :staticData="staticData" ></unit-box>
                     <!-- <category
                         ref="category"
                         v-show="category"
@@ -786,46 +786,56 @@ export default {
                 
             ],//处置网格header
 
-        value:'1',
+        value111:'1',   
+        //24、厂房仓库?? 25、大型商业综合体??  27、批发市场?? 
+        // 23、宾馆酒店  26、规模租赁公寓 28、三合一场所 29、养老机构 30、医疗机构
         options: [
         {
             value: '1',
             label: '电动自行车现状模排报告',
         },
         {
-            value: '2',
+            value: '23',
             label: '宾馆酒店信息统计',
         },
+       
         {
-            value: '3',
-            label: '大型商业综合体统计',
-        },{
-            value: '4',
-            label: '街镇小区数量统计',
-        },
-        {
-            value: '5',
+            value: '26',
             label: '规模租赁公寓统计',
         },
         {
-            value: '6',
+            value: '28',
             label: '三合一场所信息统计',
         },{
-            value: '7',
+            value: '29',
             label: '养老机构安全隐患清单',
         },
         {
-            value: '8',
+            value: '30',
             label: '医疗机构安全隐患清单',
         },
-        {
-            value: '9',
-            label: '重大火灾隐患单位清单',
-        },{
-            value: '10',
-            label: '重点单位信息统计',
-        },
+        
+        // {
+        //     value: '3',
+        //     label: '大型商业综合体统计',
+        // },{
+        //     value: '4',
+        //     label: '街镇小区数量统计',
+        // },
+        // {
+        //     value: '9',
+        //     label: '重大火灾隐患单位清单',
+        // },{
+        //     value: '10',
+        //     label: '重点单位信息统计',
+        // },
         ],
+        arrayData:[],
+        staticData:{
+            array:[],
+            total:0
+
+        },
         zfjly1:undefined,
         zfjly2:undefined,
         selectVideoData: [],
@@ -1192,6 +1202,50 @@ export default {
         // this.sadianSelect(this.checkedArray.checkedData[0]); //撒点
     },
     methods: {
+        getOneUnit(val){
+            console.log(val)
+            if(val=='29'||val=='30'){  //表格及撒点
+                this.$axios.post(this.$api.water.baseGgpFacilityList,{
+                                "facilityType": [val ] 
+                        }).then((res) => {
+                            console.log(res)
+                                let arr = []
+                                if(res.data.length>0){
+                                        arr = res.data;
+                                        this.arrayData= res.data;
+                                        if(val=='29'){
+                                            this.addMarker(arr, "security-plan", "养老机构安全隐患清单")
+                                        }else{
+                                            this.addMarker(arr, "security-plan", "医疗机构安全隐患清单")
+                                        }
+                                }
+                                
+                               
+                        });
+
+            }else if(val=='23'||val=='26'||val=='28'){ //统计
+                this.$axios.get(
+                    this.$api.water.baseGgpFacilityStatistic +
+                    "?" +
+                    this.$qs.stringify({
+                        facilityType: val, 
+                    })
+                ).then(res=>{
+                    this.staticData.array=res.data;
+                    var aa=0
+                    console.log(res)
+                    res.data.forEach(function(item){
+                        console.log(item)
+                        aa+=Number(item.count)
+
+                    })
+                    this.staticData.total=aa
+                    console.log( this.staticData.total)
+
+                })
+
+            }
+        },
         beforeDestroy() {
             this.autoScroll(true);
         },
@@ -2166,6 +2220,8 @@ export default {
             // "http://videocdn.didano.com/school765class0channelId2761namedingdangm/playlist.m3u8"
             this.play()
         },
+     
+
     },
     // watch: {
     //     "stores.$state.jkspData": function (newValue, oldValue) {