Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

SolarPower/Controllers/PowerStationController.cs

@@ -1969,7 +1969,12 @@ namespace SolarPower.Controllers
                 foreach(var solar in solaramount)
                 {
                     solar.MainDisplay = Path.Combine(stationImageFilePath, solar.Id.ToString()) + "/" + solar.MainDisplay;
+                    List<int> deviceControllerid = await powerStationRepository.GetAllDeviceControllerId(solar.Id, solar.SiteDB);
+                    var InverterTable = await powerStationRepository.InverterTable(deviceControllerid, solar.SiteDB);
+                    solar.InverterAmount = InverterTable.Count;
                 }
+                
+
 
                 apiResult.Data = solaramount;
             }

SolarPower/Views/PowerStation/Index.cshtml

@@ -457,6 +457,10 @@
                         return;
                     }
                     else {
+
+
+
+
                         $.each(rel.data, function (index, val) {
                             //電站卡片
                             $('#templateCard').find('.col-xl-2').attr('id', 'card' + val.id).clone().appendTo($('#solarCard' + val.cityId));