Merge branch 'develop'

CHANGELOG.md

@@ -15,7 +15,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - changed map marker in myems-web
 - updated popup style of mapbox in myems-web
-- 
+- changed baidu map to mapbox for longitude and latitude
+- chenged microgrid list alarm link to fdd fault
 ### Fixed
 - added decimal data value range check to myems-modbus-tcp.
 ### Removed

myems-admin/views/settings/energystoragepowerstation/energystoragepowerstation.model.html

@@ -31,7 +31,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{'ENERGY_STORAGE_POWER_STATION.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-10">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-admin/views/settings/microgrid/microgrid.model.html

@@ -31,7 +31,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{'MICROGRID.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-10">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstation.model.html

@@ -31,7 +31,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{'PHOTOVOLTAIC_POWER_STATION.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-10">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-admin/views/settings/space/space.model.html

@@ -103,7 +103,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label">{{'SPACE.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-8">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-admin/views/settings/store/store.model.html

@@ -32,7 +32,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{'STORE.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-10">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-admin/views/settings/windfarm/windfarm.model.html

@@ -31,7 +31,7 @@
             <div class="form-group">
                 <label class="col-sm-2 control-label">{{'WIND_FARM.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-10">
-                    <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
+                    <a class="btn btn-primary btn-rounded btn-outline" href="https://docs.mapbox.com/playground/geocoding/" target="_blank">Mapbox</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
                 </div>
             </div>

myems-web/src/components/MyEMS/Microgrid/MicrogridListItem.js

@@ -179,9 +179,10 @@ const MicrogridListItem = ({
                       'border-300': !isOnline
                     })}
                     icon={[isOnline ? 'fas' : 'far', 'exclamation-triangle']}
-                    onClick={() => window.open('notification', '_blank')}
+                    onClick={() => window.open('fdd', '_blank')}
                   >
-                    {t('Fault Alarms')}({alarms.length})
+                    {/* {t('Fault Alarms')}({alarms.length}) */}
+                    {t('Fault Alarms')}
                   </ButtonIcon>
 
                   <ButtonIcon