Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-ui/src/api/bigScreen.js

@@ -62,3 +62,12 @@ export function getRegion(params) {
     params: params
   })
 }
+
+// 机构下社区
+export function getSqxq(params) {
+  return request({
+    url: '/system/xzqhWl/sqxq',
+    method: 'get',
+    params: params
+  })
+}

ruoyi-ui/src/views/bigScreen/resources/index.vue

@@ -102,9 +102,9 @@
 import AMapLoader from '@amap/amap-jsapi-loader'
 import { mapState } from 'vuex'
 import { getstatisticaldata } from '@/api/system/dict/type'
-import { getOldmanMarkers, getOrgMarkers, getServiceMarkers, getMonitorMarkers, getSmartMarkers, getRegion } from '@/api/bigScreen'
+import { getOldmanMarkers, getOrgMarkers, getServiceMarkers, getMonitorMarkers, getSmartMarkers, getRegion,getSqxq } from '@/api/bigScreen'
+
 
-// 页面右边小组件
 import Oldman from './components/Oldman.vue'
 import Organization from './components/Organization.vue'
 import Service from './components/Service.vue'
@@ -184,6 +184,8 @@ export default {
       deptlevel:0,
       deptcurrxzqh:'',
       deptcurrlevel:0,
+      locationCode:'',
+      currsqData:[],
     }
   },
 
@@ -194,6 +196,8 @@ export default {
     })
   },
   created() {
+    this.locationCode=this.user.dept.locationCode;
+    this.locationcurrCode=this.user.dept.locationCode;
     this.deptlevel=this.user.dept.locationFilter.split(",").length;
     if  (this.deptlevel==1)
     {
@@ -217,6 +221,7 @@ export default {
     this.getTotalList()
     this.clickScreen()
     this.getMarkerList()
+    this.getSqxqa()
   },
   methods: {
     async getTotalList() {
@@ -226,6 +231,19 @@ export default {
         this.totalObj = data[0].vales[0]
       }
     },
+    async getSqxqa() {
+      const retdata = await getSqxq({code:this.locationcurrCode})
+      if (retdata.code === 200) {
+        console.log(retdata.data);
+        this.currsqData=retdata.data;
+        this.heatmapData=[];
+        this.currsqData.forEach((item) => {
+          let coluts = Math.floor(Math.random() * 101) + 1;
+          coluts=parseInt(item.sixtym)+parseInt(item.sixtyw);
+          this.heatmapData.push({"lng": item.lng, "lat": item.lat, "count": coluts})
+        })
+      }
+    },
     clearMap()
     {
       this.map.clearMap();
@@ -664,12 +682,12 @@ export default {
 
     setMarker(data,fl) {
       let markerList = []
-      this.heatmapData=[];
+      //this.heatmapData=[];
       data.forEach((item) => {
         let markeroption={};
         let markerExtData={};
         let coluts= Math.floor(Math.random() * 101)+1;
-        this.heatmapData.push({"lng": item.lng,"lat": item.lat,"count":coluts})
+       // this.heatmapData.push({"lng": item.lng,"lat": item.lat,"count":coluts})
         if (fl == 0) { //老人
           markeroption= {
             position: new AMap.LngLat(item.lng, item.lat),
@@ -761,11 +779,11 @@ export default {
     },
     setClusterMarker(data,fl) {
       this.latdata=[];
-      this.heatmapData=[];
+      //this.heatmapData=[];
       data.forEach((item) => {
         if (item.lat && item.lng) {
           let coluts= Math.floor(Math.random() * 101)+1;
-          this.heatmapData.push({"lng": item.lng,"lat": item.lat,"count":coluts});
+         // this.heatmapData.push({"lng": item.lng,"lat": item.lat,"count":coluts});
           if (fl == 0) { //老人
             this.latdata.push({
               lnglat: [item.lng, item.lat],