Merge branch 'develop'

database/install/myems_system_db.sql

@@ -771,8 +771,8 @@ VALUES
 (1301,'Microgrid Details','/microgrid/details',1300,1),
 (1302,'Microgrid Reporting','/microgrid/reporting',1300,1),
 (1400,'Energy Storage Power Station','/energystoragepowerstation',NULL,1),
-(1401,'Energy Storage Power Station Details','/energystoragepowerstation/details',1400,1),
-(1402,'Energy Storage Power Station List','/energystoragepowerstation/list', 1400, 1),
+(1401,'Energy Storage Power Station List','/energystoragepowerstation/list', 1400, 1),
+(1402,'Energy Storage Power Station Details','/energystoragepowerstation/details',1400,1),
 (1403,'Energy Storage Power Station Reporting','/energystoragepowerstation/reporting', 1400, 1),
 (1404,'Energy Storage Power Station Alarm','/energystoragepowerstation/alarm', 1400, 1),
 (1405,'Energy Storage Power Station Maintenance','/energystoragepowerstation/maintenance', 1400, 1);

database/upgrade/upgrade4.4.0RC.sql

@@ -8,9 +8,11 @@ START TRANSACTION;
 
 UPDATE myems_system_db.tbl_menus SET route='/energystoragepowerstation/details' WHERE id=1401;
 
+DELETE FROM myems_system_db.tbl_menus WHERE id=1401;
 INSERT INTO myems_system_db.tbl_menus (id, name, route, parent_menu_id, is_hidden)
 VALUES
-(1402, 'Energy Storage Power Station List','/energystoragepowerstation/list', 1400, 1),
+(1401, 'Energy Storage Power Station List','/energystoragepowerstation/list', 1400, 1),
+(1402,'Energy Storage Power Station Details','/energystoragepowerstation/details',1400,1),
 (1403, 'Energy Storage Power Station Reporting','/energystoragepowerstation/reporting', 1400, 1),
 (1404, 'Energy Storage Power Station Alarm','/energystoragepowerstation/alarm', 1400, 1),
 (1405, 'Energy Storage Power Station Maintenance','/energystoragepowerstation/maintenance', 1400, 1);

myems-web/src/layouts/MyEMSRoutes.js

@@ -459,8 +459,8 @@ const MyEMSRoutes = () => (
     <Route path="/microgrid/reporting" exact component={MicrogridReporting} />
 
     {/*EnergyStoragePowerStation*/}
-    <Route path="/energystoragepowerstation/details" exact component={EnergyStoragePowerStationDetails} />
     <Route path="/energystoragepowerstation/list" exact component={EnergyStoragePowerStationList} />
+    <Route path="/energystoragepowerstation/details" exact component={EnergyStoragePowerStationDetails} />
     <Route path="/energystoragepowerstation/reporting" exact component={EnergyStoragePowerStationReporting} />
     <Route path="/energystoragepowerstation/alarm" exact component={Notification} />
     <Route path="/energystoragepowerstation/maintenance" exact component={EnergyStoragePowerStationDetails} />

myems-web/src/routes.js

@@ -473,7 +473,7 @@ export const energyStoragePowerStationRoutes = {
   to: '/energystoragepowerstation',
   icon: 'building',
   children: [
-    { to: '/energystoragepowerstation', name: 'Energy Storage Power Station List' },
+    { to: '/energystoragepowerstation/list', name: 'Energy Storage Power Station List' },
     { to: '/energystoragepowerstation/details', name: 'Energy Storage Power Station Details' },
     { to: '/energystoragepowerstation/reporting', name: 'Energy Storage Power Station Reporting' },
     { to: '/energystoragepowerstation/alarm', name: 'Energy Storage Power Station Alarm' },