zy 2 роки тому
батько
коміт
46445ac694

+ 13 - 6
neim-ui/src/views/largeScreenPage/components/3DbigeMap.vue

@@ -188,13 +188,13 @@ export default {
           },{
             billboard:{
               heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
-              image: '/img/fengji/fengjiyellow.png',
+              image: '/img/fengji/fengjigreen.png',
               scale: 0.2
             }
           },{
             billboard:{
               heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
-              image: '/img/fengji/fengjigreen.png',
+              image: '/img/fengji/fengjiyellow.png',
               scale: 0.2
             }
           }]
@@ -203,10 +203,17 @@ export default {
           for (let fan of data.fan) {
             if(i>3) i = 0
             for (let item of fan.data) {
-              viewer.entities.add({
-                position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
-                billboard: image[i].billboard
-              });
+              if(fan.name === '依兰珠山风电场'){
+                viewer.entities.add({
+                  position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
+                  billboard: image[3].billboard
+                });
+              }else{
+                viewer.entities.add({
+                  position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
+                  billboard: image[i].billboard
+                });
+              }
             }
             i++;
           }

+ 12 - 4
neim-ui/src/views/largeScreenPage/components/bigeHeatMap.vue

@@ -448,10 +448,18 @@ export default {
             if(i>3) i = 0
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
-              let marker = window.BM.marker(coordinate, {
-                icon: fj_icon[i].icon,
-                riseOnHover: true
-              }).addTo(this.bMap);
+              let marker = ''
+              if(fan.name === '依兰珠山风电场'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[3].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }else{
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[i].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {

+ 12 - 4
neim-ui/src/views/largeScreenPage/components/bigeHeatSunMap.vue

@@ -430,10 +430,18 @@ export default {
             if(i>3) i = 0
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
-              let marker = window.BM.marker(coordinate, {
-                icon: fj_icon[i].icon,
-                riseOnHover: true
-              }).addTo(this.bMap);
+              let marker = ''
+              if(fan.name === '依兰珠山风电场'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[3].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }else{
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[i].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {

+ 15 - 5
neim-ui/src/views/largeScreenPage/components/bigeMap.vue

@@ -400,22 +400,32 @@ export default {
               className: 'stationIcon',
             })
           }]
+          console.log(data.fan)
           let i = 0
           for (let fan of data.fan) {
             if(i>3) i = 0
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
-              let marker = window.BM.marker(coordinate, {
-                icon: fj_icon[i].icon,
-                riseOnHover: true
-              }).addTo(this.bMap);
+              let marker = ''
+              if(fan.name === '依兰珠山风电场'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[3].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }else{
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[i].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }
+
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {
                   marker.bindTooltip('<div>所属场站名称:' + fan.name + '</div>' + '<div>经度:' + item.longitudeFan + '</div>' + '<div>纬度:' + item.latitudeFan + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 } else {
-                  marker.bindTooltip('<div>所属场站名称:' + fan.name + '</div>' + '<div>经度:' + item.longitudeFan + '</div>' + '<div>纬度:' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>所属场站名称:' + fan.name + '</div>' + '<div>经度:' + item.longitudeFan + '</div>' + '<div>纬度:' + item.latitudeFan + '</div>'+ '<div>机型:' + item.fanModel + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 }
 

+ 12 - 4
neim-ui/src/views/largeScreenPage/components/zaiXianBigeMap.vue

@@ -382,10 +382,18 @@ export default {
             if(i>3) i = 0
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
-              let marker = window.BM.marker(coordinate, {
-                icon: fj_icon[i].icon,
-                riseOnHover: true
-              }).addTo(this.bMap);
+              let marker = ''
+              if(fan.name === '依兰珠山风电场'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[3].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }else{
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[i].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
+              }
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {