地图升级

neim-ui/src/views/largeScreenPage/Subpage/projectEvolve.vue

@@ -16,7 +16,7 @@
       <div class="tableBox">
         <div class="tableTiltleTextBg">
           <div class="tableTitle">
-            <span class="mainTitle">项目工作进展情况</span>
+            <span class="mainTitle">{{project.projectSort}}工作进展情况</span>
           </div>
         </div>
         <div class="tableContent">
@@ -31,7 +31,7 @@
               width="80" align="center">
             </el-table-column>
             <el-table-column
-              prop="taskContent"
+              prop="taskContent"  width="210"
               label="工作内容" align="center">
             </el-table-column>
             <el-table-column

neim-ui/src/views/largeScreenPage/Subpage/provincialEnergyStations.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <div class="myMain-container">
-        <div class="rightTextBg">
+        <div class="rightTextBg" v-if="rightShow">
           <div class="rightBg topBox">
             <div class="rightTiltleTextBg">
               <div class="rightMainTitle">
@@ -93,16 +93,16 @@
           </div>
         </div>
         <div v-if="mapMark === 'mapBtuOne'">
-          <bige-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-map ref="childMethod" :mapValue="mapValue"  @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtuThree'">
-          <bige-heat-map  ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-map  ref="childMethod" :mapValue="mapValue"  @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtuFive'">
-          <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"  @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtu'">
-          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>
+          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"  @changeZoom="changeZoom"/>
         </div>
 
       </div>
@@ -125,6 +125,7 @@ export default {
     return {
       timer: null,
       time: '',
+      rightShow:false, //右侧信息在七级以上才会显示
       mapMark:'mapBtuOne',
       provinceInfo: {//全省信息
         // fNum:'100',
@@ -156,10 +157,12 @@ export default {
   mounted() {
     this.formatTime()
     this.getInfo()
-
     this.timer = setInterval(this.formatTime, 1000 * 60)
   },
   methods: {
+    changeZoom(val){
+      this.rightShow = val>=7
+    },
     getInfo() {
       getStationSeat().then(res=>{
         console.log(res.data)
@@ -170,6 +173,7 @@ export default {
           center: [],//中心坐标
           allStationInfo: res.data,//场站坐标
         }
+        this.rightShow = this.$refs.childMethod.level !== null && this.$refs.childMethod.level !== undefined && this.$refs.childMethod.level>=7
       }).catch(err=>{
         console.log('所有场站位置查询异常' + err)
       })

neim-ui/src/views/largeScreenPage/components/bigeHeatMap.vue

@@ -232,7 +232,9 @@ export default {
         let hfSIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafuStation.png'
         let pIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/project.png'
         let fjIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji.png'
-
+        let gfbconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guangfuban.png'
+        let gfsconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guang.png'
+        let gfhfconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafugf.png'
         // 所有场站标记点位
         if (this.mapData.allStationInfo !== null && this.mapData.allStationInfo !== undefined) {
           let data = this.mapData.allStationInfo
@@ -243,15 +245,34 @@ export default {
           })
           let hf_station_icon = window.BM.icon({
             iconUrl: hfSIconurl,
-            iconSize: [35, 55],
-            iconAnchor: [35, 55]
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
+          })
+          let gfstation_icon = window.BM.icon({
+            iconUrl: gfsconurl,
+            iconSize: [25, 43],
+            iconAnchor: [25, 43]
+          })
+          let hf_gfstation_icon = window.BM.icon({
+            iconUrl: gfhfconurl,
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
           })
           for (let item of data.otherStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker =window.BM.marker(coordinate, {
+                icon: gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
+
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -262,10 +283,18 @@ export default {
           }
           for (let item of data.HDStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: hf_station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: hf_station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker = window.BM.marker(coordinate, {
+                icon: hf_gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -284,13 +313,26 @@ export default {
             iconSize: [30, 50],
             iconAnchor: [30, 50]
           })
+          let gf_icon = window.BM.icon({
+            iconUrl: gfbconurl,
+            iconSize: [30, 50],
+            iconAnchor: [30, 50]
+          })
           for (let item of data) {
            if(item.latitude !== undefined){
              let coordinate = [Number(item.latitude), Number(item.longitude)]
-             let marker = window.BM.marker(coordinate, {
-               icon: station_icon,
-               riseOnHover: true
-             }).addTo(this.bMap);
+             let marker = '';
+             if(item.type === '风'){
+               marker = window.BM.marker(coordinate, {
+                 icon: station_icon,
+                 riseOnHover: true
+               }).addTo(this.bMap);
+             }else {
+               marker = window.BM.marker(coordinate, {
+                 icon: gf_icon,
+                 riseOnHover: true
+               }).addTo(this.bMap);
+             }
              // 悬浮动作
              marker.on('mouseover', function (e) {
                marker.bindTooltip('<div>项目名称：' + item.projectNameEasy + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
@@ -493,6 +535,7 @@ export default {
       //添加一个缩放事件
       map.on('zoomend', function (e) {
         _self.level = this.getZoom()
+        _self.$emit('changeZoom', this.getZoom())
         document.getElementById('zoom').innerHTML = '当前级别 : ' + this.getZoom();
       });
     },

neim-ui/src/views/largeScreenPage/components/bigeHeatSunMap.vue

@@ -223,13 +223,15 @@ export default {
           //绑定事件
           this.bindEvents(this.bMap);
         })
-        let sIconurl = 'http://'+_self.href.split("//")[1].split("/")[0]+'/largeScreenImg/station.png'
-        let hfSIconurl = 'http://'+_self.href.split("//")[1].split("/")[0]+'/largeScreenImg/huafuStation.png'
+        let sIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/station.png'
+        let hfSIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafuStation.png'
         let pIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/project.png'
         let fjIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji.png'
-
+        let gfbconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guangfuban.png'
+        let gfsconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guang.png'
+        let gfhfconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafugf.png'
         // 所有场站标记点位
-        if(this.mapData.allStationInfo !== null && this.mapData.allStationInfo !== undefined){
+        if (this.mapData.allStationInfo !== null && this.mapData.allStationInfo !== undefined) {
           let data = this.mapData.allStationInfo
           let station_icon = window.BM.icon({
             iconUrl: sIconurl,
@@ -238,32 +240,59 @@ export default {
           })
           let hf_station_icon = window.BM.icon({
             iconUrl: hfSIconurl,
-            iconSize: [35, 55],
-            iconAnchor: [35, 55]
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
           })
-          for(let item of data.otherStation){
-            let coordinate = [Number(item.latitude),Number(item.longitude)]
-            let marker = window.BM.marker(coordinate,{
-              icon: station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+          let gfstation_icon = window.BM.icon({
+            iconUrl: gfsconurl,
+            iconSize: [25, 43],
+            iconAnchor: [25, 43]
+          })
+          let hf_gfstation_icon = window.BM.icon({
+            iconUrl: gfhfconurl,
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
+          })
+          for (let item of data.otherStation) {
+            let coordinate = [Number(item.latitude), Number(item.longitude)]
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker =window.BM.marker(coordinate, {
+                icon: gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
+
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
-                {permanent:true,className:'infoToolTip',offset:[0,-30]}).openTooltip();
+                {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
             })
             marker.on('mouseout', function () {
               marker.bindTooltip().closeTooltip();
             })
           }
-          for(let item of data.HDStation){
-            let coordinate = [Number(item.latitude),Number(item.longitude)]
-            let marker = window.BM.marker(coordinate,{
-              icon: hf_station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+          for (let item of data.HDStation) {
+            let coordinate = [Number(item.latitude), Number(item.longitude)]
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: hf_station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker = window.BM.marker(coordinate, {
+                icon: hf_gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
-                {permanent:true,className:'infoToolTip',offset:[0,-30]}).openTooltip();
+                {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
             })
             marker.on('mouseout', function () {
               marker.bindTooltip().closeTooltip();
@@ -484,6 +513,7 @@ export default {
       //添加一个缩放事件
       map.on('zoomend', function (e) {
         _self.level = this.getZoom()
+        _self.$emit('changeZoom', this.getZoom())
         document.getElementById('zoom').innerHTML = '当前级别 : ' + this.getZoom();
       });
     },

neim-ui/src/views/largeScreenPage/components/bigeMap.vue

@@ -185,7 +185,9 @@ export default {
         let hfSIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafuStation.png'
         let pIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/project.png'
         let fjIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji.png'
-
+        let gfbconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guangfuban.png'
+        let gfsconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guang.png'
+        let gfhfconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafugf.png'
         // 所有场站标记点位
         if (this.mapData.allStationInfo !== null && this.mapData.allStationInfo !== undefined) {
           let data = this.mapData.allStationInfo
@@ -196,15 +198,34 @@ export default {
           })
           let hf_station_icon = window.BM.icon({
             iconUrl: hfSIconurl,
-            iconSize: [35, 55],
-            iconAnchor: [35, 55]
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
+          })
+          let gfstation_icon = window.BM.icon({
+            iconUrl: gfsconurl,
+            iconSize: [25, 43],
+            iconAnchor: [25, 43]
+          })
+          let hf_gfstation_icon = window.BM.icon({
+            iconUrl: gfhfconurl,
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
           })
           for (let item of data.otherStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker =window.BM.marker(coordinate, {
+                icon: gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
+
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -215,10 +236,18 @@ export default {
           }
           for (let item of data.HDStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: hf_station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: hf_station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker = window.BM.marker(coordinate, {
+                icon: hf_gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -237,13 +266,26 @@ export default {
             iconSize: [30, 50],
             iconAnchor: [30, 50]
           })
+          let gf_icon = window.BM.icon({
+            iconUrl: gfbconurl,
+            iconSize: [30, 50],
+            iconAnchor: [30, 50]
+          })
           for (let item of data) {
-            if (item.latitude !== undefined) {
+            if(item.latitude !== undefined){
               let coordinate = [Number(item.latitude), Number(item.longitude)]
-              let marker = window.BM.marker(coordinate, {
-                icon: station_icon,
-                riseOnHover: true
-              }).addTo(this.bMap);
+              let marker = '';
+              if(item.type === '风'){
+                marker = window.BM.marker(coordinate, {
+                  icon: station_icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }else {
+                marker = window.BM.marker(coordinate, {
+                  icon: gf_icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }
               // 悬浮动作
               marker.on('mouseover', function (e) {
                 marker.bindTooltip('<div>项目名称：' + item.projectNameEasy + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
@@ -442,6 +484,7 @@ export default {
       //添加一个缩放事件
       map.on('zoomend', function (e) {
         _self.level = this.getZoom()
+        _self.$emit('changeZoom', this.getZoom())
         document.getElementById('zoom').innerHTML = '当前级别 : ' + this.getZoom();
       });
     },

neim-ui/src/views/largeScreenPage/components/zaiXianBigeMap.vue

@@ -146,7 +146,9 @@ export default {
         let hfSIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafuStation.png'
         let pIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/project.png'
         let fjIconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji.png'
-
+        let gfbconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guangfuban.png'
+        let gfsconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guang.png'
+        let gfhfconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafugf.png'
         // 所有场站标记点位
         if (this.mapData.allStationInfo !== null && this.mapData.allStationInfo !== undefined) {
           let data = this.mapData.allStationInfo
@@ -157,15 +159,34 @@ export default {
           })
           let hf_station_icon = window.BM.icon({
             iconUrl: hfSIconurl,
-            iconSize: [35, 55],
-            iconAnchor: [35, 55]
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
+          })
+          let gfstation_icon = window.BM.icon({
+            iconUrl: gfsconurl,
+            iconSize: [25, 43],
+            iconAnchor: [25, 43]
+          })
+          let hf_gfstation_icon = window.BM.icon({
+            iconUrl: gfhfconurl,
+            iconSize: [33, 55],
+            iconAnchor: [33, 55]
           })
           for (let item of data.otherStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker =window.BM.marker(coordinate, {
+                icon: gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
+
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -176,10 +197,18 @@ export default {
           }
           for (let item of data.HDStation) {
             let coordinate = [Number(item.latitude), Number(item.longitude)]
-            let marker = window.BM.marker(coordinate, {
-              icon: hf_station_icon,
-              riseOnHover: true
-            }).addTo(this.bMap);
+            let marker = '';
+            if(item.type === '风'){
+              marker = window.BM.marker(coordinate, {
+                icon: hf_station_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }else {
+              marker = window.BM.marker(coordinate, {
+                icon: hf_gfstation_icon,
+                riseOnHover: true
+              }).addTo(this.bMap);
+            }
             marker.on('mouseover', function (e) {
               marker.bindTooltip('<div>场站名称：' + item.stationName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
                 {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
@@ -407,6 +436,7 @@ export default {
       //添加一个缩放事件
       map.on('zoomend', function (e) {
         _self.level = this.getZoom()
+        _self.$emit('changeZoom', this.getZoom())
         document.getElementById('zoom').innerHTML = '当前级别 : ' + this.getZoom();
       });
     },

neim-ui/src/views/largeScreenPage/index.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="myMain-container">
-        <div class="rightTextBg">
+        <div v-if="rightShow" class="rightTextBg">
           <div class="rightTiltleTextBg">
             <div class="rightMainTitle">
               <span class="mainTitle">风光资源概况</span>
@@ -56,16 +56,16 @@
           </div>
         </div>
         <div v-if="mapMark === 'mapBtuOne'">
-          <bige-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-map ref="childMethod" :mapValue="mapValue" @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtuThree'">
-          <bige-heat-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-map ref="childMethod" :mapValue="mapValue" @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtuFive'">
-          <bige-heat-sun-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-sun-map ref="childMethod" :mapValue="mapValue" @changeZoom="changeZoom"/>
         </div>
         <div v-if="mapMark === 'mapBtu'">
-          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>
+          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue" @changeZoom="changeZoom"/>
         </div>
       </div>
     </div>
@@ -88,7 +88,7 @@ export default {
     return {
       BM: null,
       Bmap: null,
-
+      rightShow:false,//右侧信息在七级以上才会显示
       velocityLayer: null,
       leavel: {},
       latlngs: [[[0.0, 0.0], [0.0, 0.0]]],
@@ -118,6 +118,9 @@ export default {
     this.timer = setInterval(this.formatTime, 1000 * 60)
   },
   methods: {
+    changeZoom(val){
+      this.rightShow = val>=7
+    },
     getInfo() {
       this.mapValue = {
         params: new Date(),
@@ -125,6 +128,7 @@ export default {
         center: [],//中心坐标
         allStationInfo: null,//场站坐标
       }
+      this.rightShow = this.$refs.childMethod.level !== null && this.$refs.childMethod.level !== undefined && this.$refs.childMethod.level>=7
       provincialEnergyInfo().then(res => {
         this.resourcesOverview = res.data.resourcesOverview
       }).catch(err => {